From: Xinchen Hui Date: Sat, 15 Mar 2014 14:37:27 +0000 (+0800) Subject: IS_UNDEF should never goes to user script land X-Git-Tag: POST_PHPNG_MERGE~412^2~309 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0bbc227aadd116431722efb656acee4f662f627;p=php IS_UNDEF should never goes to user script land --- diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index aa66e5ca25..82f166fe6d 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -430,7 +430,7 @@ static void spl_array_write_dimension_ex(int check_inherited, zval *object, zval if (check_inherited && intern->fptr_offset_set) { zval tmp; if (!offset) { - ZVAL_UNDEF(&tmp); + ZVAL_NULL(&tmp); offset = &tmp; } else { SEPARATE_ARG_IF_REF(offset); diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index d8f61ce349..0a8b8502fd 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -422,7 +422,7 @@ static void spl_fixedarray_object_write_dimension(zval *object, zval *offset, zv if (intern->fptr_offset_set) { zval tmp; if (!offset) { - ZVAL_UNDEF(&tmp); + ZVAL_NULL(&tmp); offset = &tmp; } else { SEPARATE_ARG_IF_REF(offset);