diff options
| author | Xinchen Hui <laruence@php.net> | 2012-02-12 05:32:24 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-02-12 05:32:24 +0000 |
| commit | af92365239fccda0c20c37e0ae9583ad2a11f3cc (patch) | |
| tree | 631de2ac13bf99a8906f5c8ea86db066a54147a7 | |
| parent | 3d898cfa3f7d801a47dc18fe665081ed738b70da (diff) | |
| download | php-git-af92365239fccda0c20c37e0ae9583ad2a11f3cc.tar.gz | |
Improved fix for #61058, and add test script
| -rw-r--r-- | ext/standard/array.c | 13 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug61058.phpt | 8 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index bd7d125eba..7af2f44b60 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1563,15 +1563,16 @@ PHP_FUNCTION(array_fill) array_init_size(return_value, num); num--; + zend_hash_index_update(Z_ARRVAL_P(return_value), start_key, &val, sizeof(zval *), NULL); 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); - } 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 index 0000000000..1f0f6fe630 --- /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 |