Use ZVAL_DEINDIRECT

ndossche · ndossche · commit b3cc8a81b21f · 2024-11-23T16:01:27.000+01:00
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -1037,9 +1037,7 @@ static void ia_return_current(zval *return_value, HashTable *array)
 		RETURN_FALSE;
 	}
 
-	if (Z_TYPE_P(entry) == IS_INDIRECT) {
-		entry = Z_INDIRECT_P(entry);
-	}
+	ZVAL_DEINDIRECT(entry);
 
 	/* Possible with an uninitialized typed property */
 	if (Z_TYPE_P(entry) == IS_UNDEF) {

Original file line number	Diff line number	Diff line change
`@@ -1037,9 +1037,7 @@ static void ia_return_current(zval return_value, HashTable array)`
`1037`	`1037`	`RETURN_FALSE;`
`1038`	`1038`	`}`
`1039`	`1039`
`1040`		`- if (Z_TYPE_P(entry) == IS_INDIRECT) {`
`1041`		`- entry = Z_INDIRECT_P(entry);`
`1042`		`- }`
	`1040`	`+ ZVAL_DEINDIRECT(entry);`
`1043`	`1041`
`1044`	`1042`	`/* Possible with an uninitialized typed property */`
`1045`	`1043`	`if (Z_TYPE_P(entry) == IS_UNDEF) {`