From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 12 Apr 2016 19:15:16 +0000 (+0300)
Subject: Added missing "goto"
X-Git-Tag: php-7.1.0alpha1~329^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b16180232bb94a9557228bf25da65cdc921b37;p=php

Added missing "goto"
---

diff --git a/Zend/tests/list_keyed_conversions.phpt b/Zend/tests/list_keyed_conversions.phpt
index e2cf91a27d..bf0349b327 100644
--- 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 ef7fa64974..26cee42d41 100644
--- 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 d263527b82..a96933389f 100644
--- 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");
 		}