com php-src: IS_UNDEF should never goes to user s cript land: ext/spl/spl_array.c ext/spl/spl_fixed array.c

Commit: d0bbc227aadd116431722efb656acee4f662f627 Author: Xinchen Hui <laruence@gmail.com> Sat, 15 Mar 2014 22:37:27 +0800 Parents: 2a8cef80cfca8b10a6b368ea4e05c0beb91c8c80 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0bbc227aadd116431722efb656acee4f662f627 Log: IS_UNDEF should never goes to user script land Changed paths: M ext/spl/spl_array.c M ext/spl/spl_fixedarray.c Diff: diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index aa66e5c..82f166fe 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 d8f61ce..0a8b850 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);