iliaa Tue Dec 18 13:48:19 2007 UTC
Modified files:
/php-src/ext/curl interface.c
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.120&r2=1.121&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.120 php-src/ext/curl/interface.c:1.121
--- php-src/ext/curl/interface.c:1.120 Tue Dec 4 08:55:58 2007
+++ php-src/ext/curl/interface.c Tue Dec 18 13:48:19 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.120 2007/12/04 08:55:58 tony2001 Exp $ */
+/* $Id: interface.c,v 1.121 2007/12/18 13:48:19 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_ascii_string_ex(return_value, s, sizeof(s), (char
*) v, 1);
+#define CAAS(s, v) add_assoc_ascii_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__)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
