cvs: php-src(PHP_5_3) /ext/curl interface.c

From: Date: Tue, 18 Dec 2007 13:46:07 +0000
Subject: cvs: php-src(PHP_5_3) /ext/curl interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-47549@lists.php.net to get a copy of this message
iliaa Tue Dec 18 13:46:07 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: 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.27.2.5&r2=1.62.2.14.2.27.2.6&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.6 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5 Tue Dec 4 08:56:07 2007 +++ php-src/ext/curl/interface.c Tue Dec 18 13:46:07 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.5 2007/12/04 08:56:07 tony2001 Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.6 2007/12/18 13:46:07 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__)

« previous php.cvs (#47549) next »