]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 4 Apr 2013 05:40:46 +0000 (13:40 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 4 Apr 2013 05:40:46 +0000 (13:40 +0800)
1  2 
Zend/zend_execute.c

index 276ad382fb192a0e7cc58aa60efe52c6eece41b5,16dc08e5020c90684963d6a37d4bc338cad89a77..ff9c2d0de2ae36da66ea048f7b5ef7be9bf2d91e
@@@ -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: