archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fix #81430: Attribute instantiation leaves dangling pointer
This commit is contained in:
Christoph M. Becker 2022-01-10 12:42:43 +01:00
commit a8c6a5cef6
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 65 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/reflection/php_reflection.c
View file

@ -6547,6 +6547,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;

31
ext/zend_test/tests/observer_bug81430_1.phpt Normal file
View file

@ -0,0 +1,31 @@
--TEST--
Bug #81430 (Attribute instantiation frame accessing invalid frame pointer)
--EXTENSIONS--
zend_test
--INI--
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
ext/zend_test/tests/observer_bug81430_2.phpt Normal file
View file

@ -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'>