From: Pierre Joye <pajoye@php.net>
Date: Wed, 8 Sep 2010 10:25:40 +0000 (+0000)
Subject: - Fix bug #52323, return value of php_network_connect_socket should be set even if... 
X-Git-Tag: php-5.4.0alpha1~191^2~983
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=487746cf3901938a334d0dd1c2886891aae5de2d;p=php

- Fix bug #52323, return value of php_network_connect_socket should be set even if the caller does not care about the error_string
---

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