array_map: Delay allocation of array_pos

ndossche · ndossche · commit b41587b01778 · 2025-10-31T22:18:50.000+01:00
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -6846,19 +6846,17 @@ PHP_FUNCTION(array_map)
 			} ZEND_HASH_FOREACH_END();
 		}
 	} else {
-		uint32_t *array_pos = (HashPosition *)ecalloc(n_arrays, sizeof(HashPosition));
-
 		for (i = 0; i < n_arrays; i++) {
 			if (Z_TYPE(arrays[i]) != IS_ARRAY) {
 				zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_value_name(&arrays[i]));
-				efree(array_pos);
 				RETURN_THROWS();
 			}
 			if (zend_hash_num_elements(Z_ARRVAL(arrays[i])) > maxlen) {
 				maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[i]));
 			}
 		}
 
+		uint32_t *array_pos = ecalloc(n_arrays, sizeof(HashPosition));
 		array_init_size(return_value, maxlen);
 
 		if (!ZEND_FCI_INITIALIZED(fci)) {

Original file line number	Diff line number	Diff line change
`@@ -6846,19 +6846,17 @@ PHP_FUNCTION(array_map)`
`6846`	`6846`	`} ZEND_HASH_FOREACH_END();`
`6847`	`6847`	`}`
`6848`	`6848`	`} else {`
`6849`		`- uint32_t array_pos = (HashPosition )ecalloc(n_arrays, sizeof(HashPosition));`
`6850`		`-`
`6851`	`6849`	`for (i = 0; i < n_arrays; i++) {`
`6852`	`6850`	`if (Z_TYPE(arrays[i]) != IS_ARRAY) {`
`6853`	`6851`	`zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_value_name(&arrays[i]));`
`6854`		`- efree(array_pos);`
`6855`	`6852`	`RETURN_THROWS();`
`6856`	`6853`	`}`
`6857`	`6854`	`if (zend_hash_num_elements(Z_ARRVAL(arrays[i])) > maxlen) {`
`6858`	`6855`	`maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[i]));`
`6859`	`6856`	`}`
`6860`	`6857`	`}`
`6861`	`6858`
	`6859`	`+ uint32_t *array_pos = ecalloc(n_arrays, sizeof(HashPosition));`
`6862`	`6860`	`array_init_size(return_value, maxlen);`
`6863`	`6861`
`6864`	`6862`	`if (!ZEND_FCI_INITIALIZED(fci)) {`