summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-04-04 13:40:21 +0800
committerXinchen Hui <laruence@php.net>2013-04-04 13:40:21 +0800
commit7fc8077e4caf1ac62e9591775f7779eb1a7c25ad (patch)
tree7ee9be9459e27732bb90f97aebcaa2a7a6bf8614 /Zend
parent9456dac54e89bdfdf9904739bae315aae9a14a81 (diff)
downloadphp-git-7fc8077e4caf1ac62e9591775f7779eb1a7c25ad.tar.gz
Fixed Bug #64578
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_execute.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index de7cd4a486..16dc08e502 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);