Added missing "goto"

diff --git a/Zend/tests/list_keyed_conversions.phpt b/Zend/tests/list_keyed_conversions.phpt
index e2cf91a27d2de99f324acf117c4d7aa573785f5e..bf0349b327666779be1b682e35ba52068e45c713 100644 (file)
--- a/Zend/tests/list_keyed_conversions.phpt
+++ b/Zend/tests/list_keyed_conversions.phpt
@@ -30,3 +30,5 @@ int(0)
 int(1)
 
 Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
+
+Notice: Undefined offset: 1 in %s on line %d

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ef7fa64974310b5c9be81ec290d1c29315333277..26cee42d41eeb9828d717100b33b7d8bb2ebfa4b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2128,6 +2128,7 @@ ZEND_VM_C_LABEL(str_index_list):
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       ZEND_VM_C_GOTO(num_index_list);
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index d263527b824116a7f2d250bb983fafb823b04b46..a96933389f72b091408dfbec3d8d86a539182f3c 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5362,6 +5362,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -9202,6 +9203,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -11123,6 +11125,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -38005,6 +38008,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -44506,6 +44510,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -48183,6 +48188,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -51520,6 +51526,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -53863,6 +53870,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }
@@ -55110,6 +55118,7 @@ str_index_list:
                } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
                        zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(offset), Z_RES_HANDLE_P(offset));
                        hval = Z_RES_HANDLE_P(offset);
+                       goto num_index_list;
                } else {
                        zend_error(E_WARNING, "Illegal offset type");
                }