Combine and pass dim_type

Girgias · Girgias · commit 82e3dd251e3c · 2021-07-17T20:12:16.000+02:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2389,8 +2389,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 		}
 	}
 	if (!is_list && EXPECTED(Z_TYPE_P(container) == IS_STRING)) {
-		zend_long offset;
-		offset = zend_check_string_offset(dim, BP_VAR_IS EXECUTE_DATA_CC);
+		zend_long offset = zend_check_string_offset(dim, dim_type EXECUTE_DATA_CC);
 		/* Illegal offset */
 		if (UNEXPECTED(EG(exception) != NULL)) {
 			ZVAL_NULL(result);

Original file line number	Diff line number	Diff line change
`@@ -2389,8 +2389,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z`
`2389`	`2389`	`}`
`2390`	`2390`	`}`
`2391`	`2391`	`if (!is_list && EXPECTED(Z_TYPE_P(container) == IS_STRING)) {`
`2392`		`- zend_long offset;`
`2393`		`- offset = zend_check_string_offset(dim, BP_VAR_IS EXECUTE_DATA_CC);`
	`2392`	`+ zend_long offset = zend_check_string_offset(dim, dim_type EXECUTE_DATA_CC);`
`2394`	`2393`	`/* Illegal offset */`
`2395`	`2394`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`2396`	`2395`	`ZVAL_NULL(result);`