Browse Source

MFH: plug leak on error (coverity issue #405)

PHP-5.2.1RC1
Antony Dovgal 19 years ago
parent
commit
43cc8937b2
  1. 2
      ext/standard/array.c
  2. 23
      ext/standard/tests/array/array_map_001.phpt

2
ext/standard/array.c

@ -4555,6 +4555,8 @@ PHP_FUNCTION(array_map)
efree(args);
efree(array_pos);
zval_dtor(return_value);
zval_ptr_dtor(&null);
efree(params);
RETURN_NULL();
}
}

23
ext/standard/tests/array/array_map_001.phpt

@ -0,0 +1,23 @@
--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
Loading…
Cancel
Save