iliaa Thu Sep 8 10:50:23 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/curl multi.c
Log:
MFH: Fixed bug #34420 (Possible crash inside curl_multi_remove_handle()).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.53&r2=1.2027.2.54&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.53 php-src/NEWS:1.2027.2.54
--- php-src/NEWS:1.2027.2.53 Wed Sep 7 11:11:29 2005
+++ php-src/NEWS Thu Sep 8 10:50:23 2005
@@ -23,6 +23,7 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34420 (Possible crash inside curl_multi_remove_handle()). (Ilia)
- Fixed bug #34331 (php crashes when variables_order is empty). (Ilia)
- Fixed bug #34311 (unserialize() crashes with chars above 191 dec). (Nuno)
- Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/curl/multi.c?r1=1.19&r2=1.19.2.1&ty=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19 php-src/ext/curl/multi.c:1.19.2.1
--- php-src/ext/curl/multi.c:1.19 Wed Aug 3 10:06:44 2005
+++ php-src/ext/curl/multi.c Thu Sep 8 10:50:23 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: multi.c,v 1.19 2005/08/03 14:06:44 sniper Exp $ */
+/* $Id: multi.c,v 1.19.2.1 2005/09/08 14:50:23 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -111,8 +111,6 @@
ZEND_FETCH_RESOURCE(mh, php_curlm *, &z_mh, -1,
le_curl_multi_handle_name, le_curl_multi_handle);
ZEND_FETCH_RESOURCE(ch, php_curl *, &z_ch, -1, le_curl_name, le_curl);
- zval_ptr_dtor(&z_ch);
-
--ch->uses;
RETURN_LONG((long) curl_multi_remove_handle(mh->multi, ch->cp));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
