diff options
| author | Pierre Joye <pajoye@php.net> | 2009-08-26 22:24:10 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-08-26 22:24:10 +0000 |
| commit | 0d332b4edb1ab381e80f09c611968bea71a8860f (patch) | |
| tree | 9204b2e0e101281fa1875c021f32ec9592df6994 | |
| parent | 1cbf3eb6c3dfab4a9c1d806ff143bfe0bc996521 (diff) | |
| download | php-git-0d332b4edb1ab381e80f09c611968bea71a8860f.tar.gz | |
- fix #49372, segfault in php_curl_option_url
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/curl/interface.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -20,6 +20,7 @@ PHP NEWS defined as a file handle. (Ilia) - Fixed memory leak in stream_is_local(). (Felipe, Tony) +- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre) - Fixed bug #49132 (posix_times returns false without error). (phpbugs at gunnu dot us) - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 3ee3435db2..3f7db13a3e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -183,7 +183,7 @@ static int php_curl_option_url(php_curl *ch, const char *url, const int len) /* return 0; } - if (!strncasecmp("file", uri->scheme, sizeof("file"))) { + if (uri->scheme && !strncasecmp("file", uri->scheme, sizeof("file"))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol 'file' disabled in cURL"); php_url_free(uri); return 0; |