summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-05-16 11:19:45 +0800
committerXinchen Hui <laruence@gmail.com>2016-05-16 11:19:45 +0800
commit1559fd7e48837b8f91de15e912865baab57bcdb5 (patch)
tree820516559e494b74023a54a332002cace574b97e
parentfb951553be0175712f4b757e05004110d7421e04 (diff)
downloadphp-git-1559fd7e48837b8f91de15e912865baab57bcdb5.tar.gz
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
-rw-r--r--NEWS8
-rw-r--r--main/network.c2
2 files changed, 7 insertions, 3 deletions
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");