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

in a crash)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index fb7fdced054f9d97ec02cb0041a17d6ac1295509..3d3668656d56c98976f906a19b024b8be7b4c5c7 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__)