diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-04 13:40:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-04 13:40:46 +0800 |
| commit | db3d629f0578b783a48302a64a0d755942f6c574 (patch) | |
| tree | 9577a05b88eec427bf87c50d2f20b7f6fe2d6270 /Zend/zend_execute.c | |
| parent | 99ad08f9a5e696654676e9db8872e4198b738936 (diff) | |
| parent | 7fc8077e4caf1ac62e9591775f7779eb1a7c25ad (diff) | |
| download | php-git-db3d629f0578b783a48302a64a0d755942f6c574.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 276ad382fb..ff9c2d0de2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1145,6 +1145,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)) { @@ -1173,9 +1177,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); |