Improved fix for #61058, and add test script

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3ca1a69a5e9d41e3bdd7645579bbcee0835ef86f..f18d558bbe419d0aa5848a1921ce5833ca7ab182 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1557,15 +1557,16 @@ PHP_FUNCTION(array_fill)
        array_init_size(return_value, num);
 
        num--;
-       zval_add_ref(&val);
-       if (zend_hash_index_update(Z_ARRVAL_P(return_value), start_key, &val, sizeof(zval *), NULL) == FAILURE) {
-               zval_ptr_dtor(&val);
-       }
+       zend_hash_index_update(Z_ARRVAL_P(return_value), start_key, &val, sizeof(zval *), NULL);
+    zval_add_ref(&val);
 
        while (num--) {
-               zval_add_ref(&val);
-               if (zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &val, sizeof(zval *), NULL) == FAILURE) {
-                       zval_ptr_dtor(&val);
+               if (zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &val, sizeof(zval *), NULL) == SUCCESS) {
+                       zval_add_ref(&val);
+               } else {
+                       zval_dtor(return_value);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element to the array as the next element is already occupied");
+                       RETURN_FALSE;
                }
        }
 }

diff --git a/ext/standard/tests/array/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt
new file mode 100644 (file)
index 0000000..1f0f6fe
--- /dev/null
+++ b/ext/standard/tests/array/bug61058.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #61058 (array_fill leaks if start index is PHP_INT_MAX)
+--FILE--
+<?php 
+array_fill(PHP_INT_MAX, 2, '*');
+?>
+--EXPECTF--
+Warning: array_fill(): Cannot add element to the array as the next element is already occupied in %sbug61058.php on line %d