fix segfault - error_string may be NULL, in this case we have to follow the old behavior

diff --git a/main/network.c b/main/network.c
index d60aa8de84226b0ee2490460a2f2cbef3037db0a..ff4cbbfd7575838de9ad655fced5d9f179dae58b 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -205,12 +205,20 @@ static int php_network_getaddresses(const char *host, int socktype, struct socka
 # endif
                
        if ((n = getaddrinfo(host, NULL, &hints, &res))) {
-               spprintf(error_string, 0, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+               if (error_string) {
+                       spprintf(error_string, 0, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
+               }
                return 0;
        } else if (res == NULL) {
-               spprintf(error_string, 0, "php_network_getaddresses: getaddrinfo failed (null result pointer) errno=%d", errno);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+               if (error_string) {
+                       spprintf(error_string, 0, "php_network_getaddresses: getaddrinfo failed (null result pointer) errno=%d", errno);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: getaddrinfo failed (null result pointer)");
+               }
                return 0;
        }
 
@@ -234,8 +242,12 @@ static int php_network_getaddresses(const char *host, int socktype, struct socka
                /* XXX NOT THREAD SAFE (is safe under win32) */
                host_info = gethostbyname(host);
                if (host_info == NULL) {
-                       spprintf(error_string, 0, "php_network_getaddresses: gethostbyname failed. errno=%d", errno);
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+                       if (error_string) {
+                               spprintf(error_string, 0, "php_network_getaddresses: gethostbyname failed. errno=%d", errno);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", *error_string);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: gethostbyname failed");
+                       }
                        return 0;
                }
                in = *((struct in_addr *) host_info->h_addr);