From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 16 May 2016 03:19:45 +0000 (+0800)
Subject: Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
X-Git-Tag: php-7.0.8RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1559fd7e48837b8f91de15e912865baab57bcdb5;p=php

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

diff --git a/NEWS b/NEWS
index d102d60792..480f57e505 100644
--- 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 e7f1b84281..ab6a8ca715 100644
--- 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");