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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index a3816895a5..774c820eda 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3418,6 +3418,8 @@ PHP_FUNCTION(array_map)
WRONG_PARAM_COUNT;
}
+ RETVAL_NULL();
+
callback = *args[0];
if (Z_TYPE_P(callback) != IS_NULL) {
if (!zend_is_callable(callback, 0, &callback_name)) {
@@ -3438,6 +3440,7 @@ PHP_FUNCTION(array_map)
if (Z_TYPE_PP(args[i+1]) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #%d should be an array", i + 2);
efree(array_len);
+ efree(array_pos);
efree(args);
return;
}