summaryrefslogtreecommitdiff
path: root/main/network.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-09-08 10:25:40 +0000
committerPierre Joye <pajoye@php.net>2010-09-08 10:25:40 +0000
commit487746cf3901938a334d0dd1c2886891aae5de2d (patch)
treedc3f63bca6a9a00921ba32c31626c04e6c1fbc59 /main/network.c
parentc57bf4a4d979118ecfd63f0b449a7c8c23fa736d (diff)
downloadphp-git-487746cf3901938a334d0dd1c2886891aae5de2d.tar.gz
- Fix bug #52323, return value of php_network_connect_socket should be set even if the caller does not care about the error_string
Diffstat (limited to 'main/network.c')
-rw-r--r--main/network.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c
index 36181da55d..b670be7d52 100644
--- a/main/network.c
+++ b/main/network.c
@@ -377,8 +377,10 @@ ok:
}
if (error && error_string) {
- *error_string = php_socket_strerror(error, NULL, 0);
ret = -1;
+ if (error_string) {
+ *error_string = php_socket_strerror(error, NULL, 0);
+ }
}
return ret;
#else