Commit: 7fc8077e4caf1ac62e9591775f7779eb1a7c25ad Author: Xinchen Hui <larue...@php.net> Thu, 4 Apr 2013 13:40:21 +0800 Parents: 9456dac54e89bdfdf9904739bae315aae9a14a81 Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7fc8077e4caf1ac62e9591775f7779eb1a7c25ad Log: Fixed Bug #64578 Bugs: https://bugs.php.net/64578 Changed paths: M Zend/zend_execute.c Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index de7cd4a..16dc08e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -937,6 +937,10 @@ convert_to_array: zend_error_noreturn(E_ERROR, "[] operator not supported for strings"); } + if (type != BP_VAR_UNSET) { + SEPARATE_ZVAL_IF_NOT_REF(container_ptr); + } + if (Z_TYPE_P(dim) != IS_LONG) { switch(Z_TYPE_P(dim)) { /* case IS_LONG: */ @@ -956,9 +960,6 @@ convert_to_array: convert_to_long(&tmp); dim = &tmp; } - if (type != BP_VAR_UNSET) { - SEPARATE_ZVAL_IF_NOT_REF(container_ptr); - } container = *container_ptr; result->str_offset.str = container; PZVAL_LOCK(container); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
