summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-06-28 21:05:20 +0800
committerXinchen Hui <laruence@php.net>2014-06-28 21:05:20 +0800
commita1426c62d515f74125de3a6b6cffc2004c81ba5c (patch)
tree9ee94f196c32a1d3987abf781227c34e04a447af
parent5614467c6b055a8978aeef7ec4577cbf6c3c7cc8 (diff)
downloadphp-git-a1426c62d515f74125de3a6b6cffc2004c81ba5c.tar.gz
Fixed initialize of zval
-rw-r--r--ext/intl/msgformat/msgformat_helpers.cpp2
-rw-r--r--ext/intl/timezone/timezone_class.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp
index ea1ea729a3..b0dd292843 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 a1996d9293..703e4d4814 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 &&