Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix zend_observer_fcall_end_all() accessing dangling pointers #7885

Closed
wants to merge 1 commit into from
Closed

Fix zend_observer_fcall_end_all() accessing dangling pointers #7885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/reflection/php_reflection.c
View file
Open in desktop
Expand Up @@ -6315,6 +6315,7 @@ static int call_attribute_constructor(
dummy_func.type = ZEND_USER_FUNCTION;
dummy_func.common.fn_flags =
attr->flags & ZEND_ATTRIBUTE_STRICT_TYPES ? ZEND_ACC_STRICT_TYPES : 0;
dummy_func.common.fn_flags |= ZEND_ACC_CALL_VIA_TRAMPOLINE;
dummy_func.op_array.filename = filename;

dummy_opline.opcode = ZEND_DO_FCALL;
Expand Down
31 changes: 31 additions & 0 deletions ext/zend_test/tests/observer_bug81430_1.phpt
View file
Open in desktop
@@ -0,0 +1,31 @@
--TEST--
Bug #81430 (Attribute instantiation frame accessing invalid frame pointer)
--EXTENSIONS--
zend_test
--INI--
beberlei marked this conversation as resolved.
Show resolved Hide resolved
memory_limit=20M
zend_test.observer.enabled=1
zend_test.observer.observe_all=1
--FILE--
<?php

#[\Attribute]
class A {
private $a;
public function __construct() {
}
}

#[A]
function B() {}

$r = new \ReflectionFunction("B");
call_user_func([$r->getAttributes(A::class)[0], 'newInstance']);
?>
--EXPECTF--
<!-- init '%s' -->
<file '%s'>
<!-- init A::__construct() -->
<A::__construct>
</A::__construct>
</file '%s'>
33 changes: 33 additions & 0 deletions ext/zend_test/tests/observer_bug81430_2.phpt
View file
Open in desktop
@@ -0,0 +1,33 @@
--TEST--
Bug #81430 (Attribute instantiation leaves dangling execute_data pointer)
--EXTENSIONS--
zend_test
--INI--
memory_limit=20M
zend_test.observer.enabled=1
zend_test.observer.observe_all=1
--FILE--
<?php

#[\Attribute]
class A {
public function __construct() {
array_map("str_repeat", ["\xFF"], [100000000]); // cause a bailout
}
}

#[A]
function B() {}

$r = new \ReflectionFunction("B");
call_user_func([$r->getAttributes(A::class)[0], 'newInstance']);
?>
--EXPECTF--
<!-- init '%s' -->
<file '%s'>
<!-- init A::__construct() -->
<A::__construct>

Fatal error: Allowed memory size of %d bytes exhausted %s in %s on line %d
</A::__construct>
</file '%s'>