iliaa Tue Dec 18 13:47:37 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-src NEWS
Log:
MFB: Fixed bug #43620 (Workaround for a bug inside libcurl 7.16.2 that can
result in a crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.31&r2=1.62.2.14.2.32&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.31
php-src/ext/curl/interface.c:1.62.2.14.2.32
--- php-src/ext/curl/interface.c:1.62.2.14.2.31 Tue Dec 4 08:56:14 2007
+++ php-src/ext/curl/interface.c Tue Dec 18 13:47:37 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.31 2007/12/04 08:56:14 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.32 2007/12/18 13:47:37 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -153,7 +153,7 @@
#define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s), (long) v);
#define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s), (double) v);
-#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v,
1);
+#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) (v
? v : ""), 1);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#if defined(PHP_WIN32) || defined(__GNUC__)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1035&r2=1.2027.2.547.2.1036&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1035 php-src/NEWS:1.2027.2.547.2.1036
--- php-src/NEWS:1.2027.2.547.2.1035 Sun Dec 16 17:22:31 2007
+++ php-src/NEWS Tue Dec 18 13:47:37 2007
@@ -3,6 +3,8 @@
?? ??? 2008, PHP 5.2.6
- Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
+- Fixed bug #43620 (Workaround for a bug inside libcurl 7.16.2 that can result
+ in a crash). (Ilia)
- Fixed bug #43606 (define missing depencies of the exif extension).
(crrodriguez at suse dot de)
- Fixed bug #43589 (a possible infinite loop in bz2_filter.c). (Greg)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
