svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c
trunk/ext/curl/interface.c
| From: | Pierre-Alain Joye | Date: | Wed, 26 Aug 2009 22:24:10 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60245@lists.php.net to get a copy of this message | ||
pajoye Wed, 26 Aug 2009 22:24:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287784
Log:
- fix #49372, segfault in php_curl_option_url
Bug: http://bugs.php.net/49372 (Assigned) Segfault in
function php_curl_option_url
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/curl/interface.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/curl/interface.c
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-08-26 21:59:54 UTC (rev 287783)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-26 22:24:10 UTC (rev 287784)
@@ -20,6 +20,7 @@
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)
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-08-26 21:59:54 UTC (rev 287783)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-08-26 22:24:10 UTC (rev 287784)
@@ -183,7 +183,7 @@
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;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-26 21:59:54 UTC (rev 287783)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-26 22:24:10 UTC (rev 287784)
@@ -28,6 +28,7 @@
- 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).
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-08-26 21:59:54 UTC (rev 287783)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-08-26 22:24:10 UTC (rev 287784)
@@ -183,7 +183,7 @@
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;
Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c 2009-08-26 21:59:54 UTC (rev 287783)
+++ php/php-src/trunk/ext/curl/interface.c 2009-08-26 22:24:10 UTC (rev 287784)
@@ -183,7 +183,7 @@
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;