com php-src: Fixed initialize of zval: ext/intl/msgformat/msgfo rmat_helpers.cpp ext/intl/timezone/timezone_class.cpp

From: Date: Sat, 28 Jun 2014 13:05:20 +0000
Subject: com php-src: Fixed initialize of zval: ext/intl/msgformat/msgfo rmat_helpers.cpp ext/intl/timezone/timezone_class.cpp
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79105@lists.php.net to get a copy of this message
Commit: a1426c62d515f74125de3a6b6cffc2004c81ba5c Author: Xinchen Hui <laruence@php.net> Sat, 28 Jun 2014 21:05:20 +0800 Parents: 5614467c6b055a8978aeef7ec4577cbf6c3c7cc8 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1426c62d515f74125de3a6b6cffc2004c81ba5c Log: Fixed initialize of zval Changed paths: M ext/intl/msgformat/msgformat_helpers.cpp M ext/intl/timezone/timezone_class.cpp Diff: diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index ea1ea72...b0dd292 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -344,7 +344,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo, if (used_tz == NULL) { zval nullzv, *zvptr = &nullzv; - ZVAL_UNDEF(zvptr); + ZVAL_NULL(zvptr); used_tz = timezone_process_timezone_argument(zvptr, &err, "msgfmt_format" TSRMLS_CC); if (used_tz == NULL) { continue; diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index a1996d9..703e4d4 100644 --- a/ext/intl/timezone/timezone_class..cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -141,7 +141,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone, ZVAL_STRING(&local_zv_tz, tzinfo->name); zv_timezone = &local_zv_tz; } else { - ZVAL_UNDEF(&local_zv_tz); + ZVAL_NULL(&local_zv_tz); } if (Z_TYPE_P(zv_timezone) == IS_OBJECT &&

« previous php.cvs (#79105) next »