com php-src: Missed one place: ext/spl/spl_array.c ext/sp l/tests/bug71028.phpt

From: Date: Fri, 04 Dec 2015 14:51:16 +0000
Subject: com php-src: Missed one place: ext/spl/spl_array.c ext/sp l/tests/bug71028.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90093@lists.php.net to get a copy of this message
Commit: 311eb2b11e97336a4c82b43b2422a30d346e5679 Author: Xinchen Hui <laruence@gmail.com> Fri, 4 Dec 2015 06:51:16 -0800 Parents: 7ac24aa661b9bc9983bb92a734e2c9993db147c5 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=311eb2b11e97336a4c82b43b2422a30d346e5679 Log: Missed one place Changed paths: M ext/spl/spl_array.c M ext/spl/tests/bug71028.phpt Diff: diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index da572f0..3b704c7 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -514,7 +514,8 @@ static void spl_array_unset_dimension_ex(int check_inherited, zval *object, zval return; } - switch(Z_TYPE_P(offset)) { +try_again: + switch (Z_TYPE_P(offset)) { case IS_STRING: ht = spl_array_get_hash_table(intern, 0); if (ht->u.v.nApplyCount > 0) { @@ -574,6 +575,9 @@ num_index: zend_error(E_NOTICE,"Undefined offset: %pd", index); } break; + case IS_REFERENCE: + ZVAL_DEREF(offset); + goto try_again; default: zend_error(E_WARNING, "Illegal offset type"); return; diff --git a/ext/spl/tests/bug71028.phpt b/ext/spl/tests/bug71028.phpt index 42d4ea3..b8f0cc9 100644 --- a/ext/spl/tests/bug71028.phpt +++ b/ext/spl/tests/bug71028.phpt @@ -14,8 +14,11 @@ cast($b); var_dump(isset($a[$b])); $a[$b] = "okey"; -echo $a[$b]; +var_dump($a[$b]); +unset($a[$b]); +var_dump(isset($a[$b])); ?> --EXPECT-- bool(true) -okey +string(4) "okey" +bool(false)

« previous php.cvs (#90093) next »