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 | 137b9210f2543bce5a067d454644fdb8c6f88b12 (patch) | |
| tree | 7aed5b8c89436767efa2a03507aa53e2fc77e30b | |
| parent | 5d017c3e2d29221821f7fcc2057b42eacb73f20f (diff) | |
| download | php-git-137b9210f2543bce5a067d454644fdb8c6f88b12.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
@@ -28,6 +28,7 @@ PHP NEWS - Fixed memory leak in stream_is_local(). (Felipe, Tony) - Fixed BC break in mime_content_type(), removes the content encoding. (Scott) +- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre) - Fixed bug #49306 (inside pdo_mysql default socket settings are ignored). (Ilia) - Fixed bug #49289 (bcmath module doesn't compile with phpize configure). diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 620eae4284..641f0f3b9f 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; |