Skip to content

Commit 47148c1

Browse files
committed
use eval instead of new_oom.inc
1 parent aa9c4f4 commit 47148c1

File tree

4 files changed

+19
-29
lines changed

4 files changed

+19
-29
lines changed

Zend/tests/fatal_error_backtraces_001.phpt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@ Fatal error backtrace
55

66
ini_set('fatal_error_backtraces', true);
77

8-
$argv[1] = "stdClass";
9-
10-
include __DIR__ . '/new_oom.inc';
11-
8+
eval("class Foo {}; class Foo {}");
129
?>
1310
--EXPECTF--
14-
Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %snew_oom.inc on line %d
11+
Fatal error: Cannot redeclare class Foo (%s) in %s : eval()'d code on line %d
1512
Stack trace:
16-
#0 %snew_oom.inc(%d): ReflectionClass->newInstanceWithoutConstructor()
17-
#1 %sfatal_error_backtraces_001.php(%d): include('%s')
18-
#2 {main}
13+
#0 %sfatal_error_backtraces_001.php(%d): eval()
14+
#1 {main}

Zend/tests/fatal_error_backtraces_002.phpt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@ Fatal error backtrace w/ sensitive parameters
55

66
ini_set('fatal_error_backtraces', true);
77

8-
function oom(#[\SensitiveParameter] $unused) {
9-
$argv[1] = "stdClass";
10-
11-
include __DIR__ . '/new_oom.inc';
8+
function trigger_fatal(#[\SensitiveParameter] $unused) {
9+
eval("class Foo {}; class Foo {}");
1210
}
1311

14-
oom("foo");
12+
trigger_fatal("bar");
1513

1614
?>
1715
--EXPECTF--
18-
Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %snew_oom.inc on line %d
16+
Fatal error: Cannot redeclare class Foo (%s) in %s : eval()'d code on line %d
1917
Stack trace:
20-
#0 %snew_oom.inc(%d): ReflectionClass->newInstanceWithoutConstructor()
21-
#1 %sfatal_error_backtraces_002.php(%d): include(%s)
22-
#2 %sfatal_error_backtraces_002.php(%d): oom(Object(SensitiveParameterValue))
23-
#3 {main}
18+
#0 %sfatal_error_backtraces_002.php(%d): eval()
19+
#1 %sfatal_error_backtraces_002.php(%d): trigger_fatal(Object(SensitiveParameterValue))
20+
#2 {main}

Zend/tests/fatal_error_backtraces_003.phpt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@ Fatal error backtrace w/ zend.exception_ignore_args
66
ini_set('fatal_error_backtraces', true);
77
ini_set('zend.exception_ignore_args', true);
88

9-
function oom($unused) {
10-
$argv[1] = "stdClass";
11-
12-
include __DIR__ . '/new_oom.inc';
9+
function trigger_fatal($unused) {
10+
eval("class Foo {}; class Foo {}");
1311
}
1412

15-
oom("foo");
13+
trigger_fatal("bar");
1614

1715
?>
1816
--EXPECTF--
19-
Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %snew_oom.inc on line %d
17+
Fatal error: Cannot redeclare class Foo (%s) in %s : eval()'d code on line %d
2018
Stack trace:
21-
#0 %snew_oom.inc(%d): ReflectionClass->newInstanceWithoutConstructor()
22-
#1 %sfatal_error_backtraces_003.php(%d): include(%s)
23-
#2 %sfatal_error_backtraces_003.php(%d): oom()
24-
#3 {main}
19+
#0 %sfatal_error_backtraces_003.php(%d): eval()
20+
#1 %sfatal_error_backtraces_003.php(%d): trigger_fatal()
21+
#2 {main}

ext/standard/tests/general_functions/error_get_last.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ array(4) {
4545
int(11)
4646
}
4747

48-
Fatal error: Cannot redeclare class Foo (previously declared in /Users/enorris/workspace/php-src/ext/standard/tests/general_functions/error_get_last.php(18) : eval()'d code:1) in /Users/enorris/workspace/php-src/ext/standard/tests/general_functions/error_get_last.php(18) : eval()'d code on line 1
48+
Fatal error: Cannot redeclare class Foo (%s) in %s on line %d
4949
Stack trace:
5050
#0 %serror_get_last.php(%d): eval()
5151
#1 %serror_get_last.php(%d): trigger_fatal_error_with_stacktrace()

0 commit comments

Comments
 (0)