SEND_UNPACK should throw exception on Traversable with non-integer keys

dstogov · dstogov · commit d84ef9674243 · 2018-07-04T09:35:12.000+03:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4521,14 +4521,13 @@ ZEND_VM_C_LABEL(send_again):
 						break;
 					}
 
-					if (Z_TYPE(key) == IS_STRING) {
+					if (UNEXPECTED(Z_TYPE(key) != IS_LONG)) {
+						ZEND_ASSERT(Z_TYPE(key) == IS_STRING);
 						zend_throw_error(NULL,
 							"Cannot unpack Traversable with string keys");
 						zend_string_release_ex(Z_STR(key), 0);
 						break;
 					}
-
-					zval_dtor(&key);
 				}
 
 				if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1358,14 +1358,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_
 						break;
 					}
 
-					if (Z_TYPE(key) == IS_STRING) {
+					if (UNEXPECTED(Z_TYPE(key) != IS_LONG)) {
+						ZEND_ASSERT(Z_TYPE(key) == IS_STRING);
 						zend_throw_error(NULL,
 							"Cannot unpack Traversable with string keys");
 						zend_string_release_ex(Z_STR(key), 0);
 						break;
 					}
-
-					zval_dtor(&key);
 				}
 
 				if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {

Original file line number	Diff line number	Diff line change
`@@ -4521,14 +4521,13 @@ ZEND_VM_C_LABEL(send_again):`
`4521`	`4521`	`break;`
`4522`	`4522`	`}`
`4523`	`4523`
`4524`		`- if (Z_TYPE(key) == IS_STRING) {`
	`4524`	`+ if (UNEXPECTED(Z_TYPE(key) != IS_LONG)) {`
	`4525`	`+ ZEND_ASSERT(Z_TYPE(key) == IS_STRING);`
`4525`	`4526`	`zend_throw_error(NULL,`
`4526`	`4527`	`"Cannot unpack Traversable with string keys");`
`4527`	`4528`	`zend_string_release_ex(Z_STR(key), 0);`
`4528`	`4529`	`break;`
`4529`	`4530`	`}`
`4530`		`-`
`4531`		`- zval_dtor(&key);`
`4532`	`4531`	`}`
`4533`	`4532`
`4534`	`4533`	`if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {`
Original file line number	Diff line number	Diff line change
`@@ -1358,14 +1358,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_`
`1358`	`1358`	`break;`
`1359`	`1359`	`}`
`1360`	`1360`
`1361`		`- if (Z_TYPE(key) == IS_STRING) {`
	`1361`	`+ if (UNEXPECTED(Z_TYPE(key) != IS_LONG)) {`
	`1362`	`+ ZEND_ASSERT(Z_TYPE(key) == IS_STRING);`
`1362`	`1363`	`zend_throw_error(NULL,`
`1363`	`1364`	`"Cannot unpack Traversable with string keys");`
`1364`	`1365`	`zend_string_release_ex(Z_STR(key), 0);`
`1365`	`1366`	`break;`
`1366`	`1367`	`}`
`1367`		`-`
`1368`		`- zval_dtor(&key);`
`1369`	`1368`	`}`
`1370`	`1369`
`1371`	`1370`	`if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {`