Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)

diff --git a/NEWS b/NEWS
index d102d60792705c97471098d7fa0ec26fc57779b6..480f57e505e04bfb309bd41f3ba6aca291a438c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,14 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2016 PHP 7.0.8
 
-- Intl
+- Core:
+  . Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes). 
+    (Laruence)
+
+- Intl:
   . Fixed bug #64524 (Add intl.use_exceptions to php.ini-*). (Anatol)
 
-- PCRE
+- PCRE:
   . Fixed bug #72143 (preg_replace uses int instead of size_t). (Joe)
 
 - PDO_pgsql:

diff --git a/main/network.c b/main/network.c
index e7f1b84281fbab6844d87d8376eabaf0eb387883..ab6a8ca71592c8cb75e1a86f62af400ac7a20776 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -253,7 +253,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
                }
                if (host_info == NULL) {
                        if (error_string) {
-                               error_string = strpprintf(0, "php_network_getaddresses: gethostbyname failed. errno=%d", errno);
+                               *error_string = strpprintf(0, "php_network_getaddresses: gethostbyname failed. errno=%d", errno);
                                php_error_docref(NULL, E_WARNING, "%s", ZSTR_VAL(*error_string));
                        } else {
                                php_error_docref(NULL, E_WARNING, "php_network_getaddresses: gethostbyname failed");