summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2002-01-21 07:54:56 +0000
committerDerick Rethans <derick@php.net>2002-01-21 07:54:56 +0000
commit580a4701ba665af12fcda129544d8ab09bf1437c (patch)
tree7fa938e9cb36c08583b760c31bac23109124ce1c /main
parentce1bbf371217d9662d6a821058d6cb8bfbdb32cc (diff)
downloadphp-git-580a4701ba665af12fcda129544d8ab09bf1437c.tar.gz
- Fix for bug #15057: getimagesize() crashes when offline (on MacOSX)
Diffstat (limited to 'main')
-rw-r--r--main/network.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/network.c b/main/network.c
index 02b7f1703a..5dd6b6ed3a 100644
--- a/main/network.c
+++ b/main/network.c
@@ -150,6 +150,9 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal)
if ((n = getaddrinfo(host, NULL, &hints, &res))) {
php_error(E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
return 0;
+ } else if (res == NULL) {
+ php_error(E_WARNING, "php_network_getaddresses: getaddrinfo failed (null result pointer)");
+ return 0;
}
sai = res;