mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 09:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed bug #46873 (extract($foo) crashes if $foo['foo'] exists)

Browse Source
This commit is contained in:
Arnaud Le Blanc 2008-12-27 03:06:57 +00:00
parent 765618b97f
commit 2dd8d6ff94
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/standard/array.c
View File

@ -1283,6 +1283,13 @@ PHP_FUNCTION(extract)
zend_rebuild_symbol_table(TSRMLS_C);
}
/* var_array is passed by ref for the needs of EXTR_REFS (needs to
* work on the original array to create refs to its members)
* simulate pass_by_value if EXTR_REFS is not used */
if (!extract_refs) {
SEPARATE_ARG_IF_REF(var_array);
}
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(var_array), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(var_array), (void **)&entry, &pos) == SUCCESS) {
zval final_name;
@ -1382,6 +1389,10 @@ PHP_FUNCTION(extract)
zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), &pos);
}
if (!extract_refs) {
zval_ptr_dtor(&var_array);
}
RETURN_LONG(count);
}
/* }}} */

12
ext/standard/tests/array/bug46873.phpt Normal file
View File

@ -0,0 +1,12 @@
--TEST--
Bug #46873 (extract($foo) crashes if $foo['foo'] exists)
--FILE--
<?php
$foo = array('foo' => 1, 'bar' => 2, 'test' => 3);
extract($foo);
var_dump($foo, $bar, $test);
?>
--EXPECT--
int(1)
int(2)
int(3)