summaryrefslogtreecommitdiff
path: root/ext/standard/array.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/array.c')
-rw-r--r--ext/standard/array.c8
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 */