diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-17 19:17:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-17 19:17:10 +0300 |
| commit | 8fe171a3e046717ec0109297bcd765bdee3e939c (patch) | |
| tree | 4e9d7308d931489c5c1c05414a47ab2ba60c1e93 /ext/standard/array.c | |
| parent | 24fc74d412e9a1da24c51a6d943c1022d2e702b1 (diff) | |
| download | php-git-8fe171a3e046717ec0109297bcd765bdee3e939c.tar.gz | |
Don't allocate memory for empty HashTables.
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index b1ee800bc2..59e957d3cd 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3308,6 +3308,9 @@ PHP_FUNCTION(array_keys) } } else { array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input))); + if (!zend_hash_num_elements(Z_ARRVAL_P(input))) { + return; + } zend_hash_real_init(Z_ARRVAL_P(return_value), 1); ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) { /* Go through input array and add keys to the return array */ @@ -3343,6 +3346,11 @@ PHP_FUNCTION(array_values) /* Initialize return array */ array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input))); + + if (!zend_hash_num_elements(Z_ARRVAL_P(input))) { + return; + } + zend_hash_real_init(Z_ARRVAL_P(return_value), 1); /* Go through input array and add values to the return array */ |