MFB: Fixed bug #43620 (Workaround for a bug inside libcurl 7.16.2 that can

result in a crash)

diff --git a/NEWS b/NEWS
index 99c98d64ba1fe0d3ba7e92c69b52ea2faa8879ff..b637b969a017593413fd78909d89bd31ebf29fed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 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)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index a0f09c030e4f6e796bf344f013b37a2da3901d41..c0381ae6211f97aaa30f4d1a4d349b2ef2a13d07 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -153,7 +153,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
 #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__)