diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-03-11 10:27:23 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-03-11 10:27:23 +0000 |
| commit | 40f85eb58582a1557fa02b9f3e88e67d3a3bdc5f (patch) | |
| tree | e2cc08802aada5e2cba8d1516c05b99c0a3fc868 /main | |
| parent | c857ec6c9856b0beaf087e7916260edbaa49ef74 (diff) | |
| download | php-git-40f85eb58582a1557fa02b9f3e88e67d3a3bdc5f.tar.gz | |
MFH: fix segfault - error_string may be NULL, in this case we have to follow the old behavior
Diffstat (limited to 'main')
| -rw-r--r-- | main/network.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/main/network.c b/main/network.c index ac9f337c3b..fe236059f6 100644 --- a/main/network.c +++ b/main/network.c @@ -200,12 +200,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; } @@ -229,8 +237,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); |