cvs: ZendEngine2(PHP_5_3) / zend_execute.c

mattwil		Fri May  9 09:23:03 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute.c 
  Log:
  MFH: Fixed bug #44681 (Resources used as array keys get converted to 0)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24.2.28&r2=1.716.2.12.2.24.2.29&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.28 ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.29
--- ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.28	Tue May  6 16:03:15 2008
+++ ZendEngine2/zend_execute.c	Fri May  9 09:23:03 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.28 2008/05/06 16:03:15 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.29 2008/05/09 09:23:03 mattwil Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -833,13 +833,13 @@
 				}
 			}
 			break;
-		case IS_RESOURCE:
-			zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(dim), Z_LVAL_P(dim));
-			/* Fall Through */
 		case IS_DOUBLE:
 			index = (long)Z_DVAL_P(dim);
 			goto num_index;
 
+		case IS_RESOURCE:
+			zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(dim), Z_LVAL_P(dim));
+			/* Fall Through */
 		case IS_BOOL:
 		case IS_LONG:
 			index = Z_LVAL_P(dim);