]> granicus.if.org Git - php/commitdiff
Fixed initialize of zval
authorXinchen Hui <laruence@php.net>
Sat, 28 Jun 2014 13:05:20 +0000 (21:05 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 28 Jun 2014 13:05:20 +0000 (21:05 +0800)
ext/intl/msgformat/msgformat_helpers.cpp
ext/intl/timezone/timezone_class.cpp

index ea1ea729a32c1c27bee296d626ed5753882a485e..b0dd2928430597d40b2fa9f3e83b0d1670ab5d7d 100644 (file)
@@ -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;
index a1996d9293f2c5ea8908962cfae52b4f23c39b70..703e4d48143d08c4650ae47f2784893d001c036c 100644 (file)
@@ -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 &&