From cd519f058c2f4f5ace183e37ab69b89111a14d6e Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Fri, 21 Sep 2007 13:50:47 +0000
Subject: [PATCH] plug leak on error (coverity issue #405)

---
 ext/standard/array.c                        |  2 ++
 ext/standard/tests/array/array_map_001.phpt | 27 +++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 ext/standard/tests/array/array_map_001.phpt

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 68616f1188..8becac62c7 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4477,6 +4477,8 @@ PHP_FUNCTION(array_map)
 				efree(args);
 				efree(array_pos);
 				zval_dtor(return_value);
+				zval_ptr_dtor(&null);
+				efree(params);
 				RETURN_NULL();
 			}
 		}
diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt
new file mode 100644
index 0000000000..e4dd279ff7
--- /dev/null
+++ b/ext/standard/tests/array/array_map_001.phpt
@@ -0,0 +1,27 @@
+--TEST--
+array_map() and exceptions in the callback
+--FILE--
+<?php
+
+$a = array(1,2,3);
+
+function foo() { 
+	throw new exception(1); 
+} 
+
+try { 
+	array_map("foo", $a, array(2,3)); 
+} catch (Exception $e) {
+	var_dump("exception caught!");
+}
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: array_map(): An error occurred while invoking the map callback in %s on line %d
+string(17) "exception caught!"
+Done
+--UEXPECTF--
+Warning: array_map(): An error occurred while invoking the map callback in %s on line %d
+unicode(17) "exception caught!"
+Done
-- 
2.50.1