From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 3 Jan 2003 05:05:12 +0000 (+0000)
Subject: Fixed small leaks in array_map() in case the first parameter is NULL like
X-Git-Tag: PHP_5_0_dev_before_13561_fix~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f962ba6abb7e8674db6a936f196ea4491eaef17c;p=php

Fixed small leaks in array_map() in case the first parameter is NULL like
array_map(NULL, array(...));
---

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;
 		}