Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ext/standard/array.c
Original file line number Diff line number Diff line change
Expand Up @@ -1863,8 +1863,10 @@ static zend_long php_extract_ref_overwrite(zend_array *arr, zend_array *symbol_t
} else {
ZVAL_MAKE_REF_EX(entry, 2);
}
zval_ptr_dtor(orig_var);
zval garbage;
ZVAL_COPY_VALUE(&garbage, orig_var);
ZVAL_REF(orig_var, Z_REF_P(entry));
zval_ptr_dtor(&garbage);
} else {
if (Z_ISREF_P(entry)) {
Z_ADDREF_P(entry);
Expand Down
23 changes: 23 additions & 0 deletions ext/standard/tests/gh18209.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-18209: Use-after-free in extract() with EXTR_REFS
--CREDITS--
Noam Rathaus (nrathaus)
--FILE--
<?php

class C {
public function __destruct() {
var_dump($GLOBALS['b']);
$GLOBALS['b'] = 43;
}
}

$b = new C;
$array = ['b' => 42];
extract($array, EXTR_REFS);
var_dump($b);

?>
--EXPECT--
int(42)
int(43)
Loading