Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX)

php · Feb 12, 2012 · c578917 · c578917
1 parent 2e61d04
commit c578917
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -45,6 +45,10 @@ PHP                                                                        NEWS
   . Fixed bug #60968 (Late static binding doesn't work with 
     ReflectionMethod::invokeArgs()). (Laruence)
 
+- Array:
+  . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
+    (Laruence)
+
 ?? ??? 2012, PHP 5.3.10
 
 (to be added)

diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -1558,11 +1558,15 @@ PHP_FUNCTION(array_fill)
 
 	num--;
 	zval_add_ref(&val);
-	zend_hash_index_update(Z_ARRVAL_P(return_value), start_key, &val, sizeof(zval *), NULL);
+	if (zend_hash_index_update(Z_ARRVAL_P(return_value), start_key, &val, sizeof(zval *), NULL) == FAILURE) {
+		zval_ptr_dtor(&val);
+	}
 
 	while (num--) {
 		zval_add_ref(&val);
-		zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &val, sizeof(zval *), NULL);
+		if (zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &val, sizeof(zval *), NULL) == FAILURE) {
+			zval_ptr_dtor(&val);
+		}
 	}
 }
 /* }}} */