com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_e xecute.c
| From: | Xinchen Hui | Date: | Thu, 04 Apr 2013 05:40:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_e xecute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71847@lists.php.net to get a copy of this message | ||
Commit: db3d629f0578b783a48302a64a0d755942f6c574
Author: Xinchen Hui <laruence@php.net> Thu, 4 Apr 2013 13:40:46 +0800
Parents: 99ad08f9a5e696654676e9db8872e4198b738936 7fc8077e4caf1ac62e9591775f7779eb1a7c25ad
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db3d629f0578b783a48302a64a0d755942f6c574
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM Zend/zend_execute.c
Diff:
diff --cc Zend/zend_execute.c
index 276ad38,16dc08e..ff9c2d0
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -1145,8 -937,11 +1145,12 @@@ 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: */
case IS_STRING: