mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Check another incarnation of bug #30266

Browse Source
This commit is contained in:
Marcus Boerger 2005-03-19 14:24:17 +00:00
parent f27fb2d715
commit e38141478a
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/array.c
View File

@ -1038,7 +1038,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata, int recursive
zend_hash_internal_pointer_reset_ex(target_hash, &pos);
/* Iterate through hash */
while (zend_hash_get_current_data_ex(target_hash, (void **)&args[0], &pos) == SUCCESS) {
while (!EG(exception) && zend_hash_get_current_data_ex(target_hash, (void **)&args[0], &pos) == SUCCESS) {
if (recursive && Z_TYPE_PP(args[0]) == IS_ARRAY) {
HashTable *thash;

37
ext/standard/tests/array/bug30266.phpt Executable file
View File

@ -0,0 +1,37 @@
--TEST--
Bug #30266 (Invalid opcode 137/1/8) and array_walk
--FILE--
<?php
class testc
{
public $b = "c";
function crash($val)
{
$this->b = $val;
throw new Exception("Error");
}
}
$fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple");
$myobj = new testc();
function test($item2, $key, $userd)
{
$userd->crash($item2);
}
try
{
array_walk($fruits, 'test', $myobj);
}
catch(Exception $e)
{
echo "Caught: " . $e->getMessage() . "\n";
}
?>
===DONE===
--EXPECT--
Caught: Error
===DONE===