com php-src: Fixed zend_string/char* mess: ext/curl/int erface.c

Commit: 55b6fb165693d00e46ff20e04d0160754925b9b3 Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 May 2014 13:44:13 +0400 Parents: 154976f711c1b8d008a6114be3d5bd608620b238 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=55b6fb165693d00e46ff20e04d0160754925b9b3 Log: Fixed zend_string/char* mess Changed paths: M ext/curl/interface.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 15e6133..1735028 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -157,7 +157,7 @@ static void _php_curl_close(zend_resource *rsrc TSRMLS_DC); #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s) - 1, (long) v); #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v); #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s) - 1, (char *) (v ? v : "")); -#define CAASTR(s, v) add_assoc_str_ex(return_value, s, sizeof(s) - 1, v? v : ""); +#define CAASTR(s, v) add_assoc_str_ex(return_value, s, sizeof(s) - 1, v ? v : STR_EMPTY_ALLOC()); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s) -1 , (zval *) v); #if defined(PHP_WIN32) || defined(__GNUC__)