archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed initialize of zval

Browse source
This commit is contained in:
Xinchen Hui 2014-06-28 21:05:20 +08:00
parent 5614467c6b
commit a1426c62d5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/intl/msgformat/msgformat_helpers.cpp
View file

@ -344,7 +344,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo,
if (used_tz == NULL) { if (used_tz == NULL) {
zval nullzv, *zvptr = &nullzv; zval nullzv, *zvptr = &nullzv;
ZVAL_UNDEF(zvptr); ZVAL_NULL(zvptr);
used_tz = timezone_process_timezone_argument(zvptr, &err, "msgfmt_format" TSRMLS_CC); used_tz = timezone_process_timezone_argument(zvptr, &err, "msgfmt_format" TSRMLS_CC);
if (used_tz == NULL) { if (used_tz == NULL) {
continue; continue;

2
ext/intl/timezone/timezone_class.cpp
View file

@ -141,7 +141,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
ZVAL_STRING(&local_zv_tz, tzinfo->name); ZVAL_STRING(&local_zv_tz, tzinfo->name);
zv_timezone = &local_zv_tz; zv_timezone = &local_zv_tz;
} else { } else {
ZVAL_UNDEF(&local_zv_tz); ZVAL_NULL(&local_zv_tz);
} }
if (Z_TYPE_P(zv_timezone) == IS_OBJECT && if (Z_TYPE_P(zv_timezone) == IS_OBJECT &&