Commit dc79609

committed

Merge branch 'PHP-8.5'

* PHP-8.5: Fix GH-16319: protect fiber backtrace with null filename from crashing (#19973)

2 parents 7b46ec6 + fe97b5a commit dc79609Copy full SHA for dc79609

File tree

+50

-2

lines changed

+50

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ static void observer_show_init(zend_function *fbc)`
`155`	`155`	`php_printf("%s<!-- init %s() -->\n", 2 ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name));`
`156`	`156`	`}`
`157`	`157`	`} else {`
`158`		`- php_printf("%s<!-- init '%s' -->\n", 2 ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->op_array.filename));`
	`158`	`+ php_printf("%s<!-- init '%s' -->\n", 2 ZT_G(observer_nesting_depth), "", fbc->op_array.filename ? ZSTR_VAL(fbc->op_array.filename) : "[no active file]");`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`@@ -178,7 +178,7 @@ static void observer_show_init_backtrace(zend_execute_data *execute_data)`
`178`	`178`	`php_printf("%*s%s()\n", indent, "", ZSTR_VAL(fbc->common.function_name));`
`179`	`179`	`}`
`180`	`180`	`} else {`
`181`		`- php_printf("%*s{main} %s\n", indent, "", ZSTR_VAL(fbc->op_array.filename));`
	`181`	`+ php_printf("%*s{main} %s\n", indent, "", fbc->op_array.filename ? ZSTR_VAL(fbc->op_array.filename) : "[no active file]");`
`182`	`182`	`}`
`183`	`183`	`} while ((ex = ex->prev_execute_data) != NULL);`
`184`	`184`	`php_printf("%s-->\n", 2 ZT_G(observer_nesting_depth), "");`

Lines changed: 48 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,48 @@`
	`1`	`+--TEST--`
	`2`	`+GH-16319 (Fiber backtrace with null filename should not crash)`
	`3`	`+--EXTENSIONS--`
	`4`	`+zend_test`
	`5`	`+--INI--`
	`6`	`+zend_test.observer.enabled=1`
	`7`	`+zend_test.observer.show_init_backtrace=1`
	`8`	`+zend_test.observer.show_output=1`
	`9`	`+zend_test.observer.observe_all=1`
	`10`	`+zend_test.observer.show_opcode=0`
	`11`	`+opcache.jit=0`
	`12`	`+--FILE--`
	`13`	`+<?php`
	`14`	`+$fiber = new Fiber(function() {});`
	`15`	`+$fiber->start();`
	`16`	`+echo "Test completed without crash\n";`
	`17`	`+?>`
	`18`	`+--EXPECTF--`
	`19`	`+<!-- init %s -->`
	`20`	`+<!--`
	`21`	`+ {main} %s`
	`22`	`+-->`
	`23`	`+<file %s>`
	`24`	`+ <!-- init Fiber::__construct() -->`
	`25`	`+ <!--`
	`26`	`+ Fiber::__construct()`
	`27`	`+ {main} %s`
	`28`	`+ -->`
	`29`	`+ <Fiber::__construct>`
	`30`	`+ </Fiber::__construct>`
	`31`	`+ <!-- init Fiber::start() -->`
	`32`	`+ <!--`
	`33`	`+ Fiber::start()`
	`34`	`+ {main} %s`
	`35`	`+ -->`
	`36`	`+ <Fiber::start>`
	`37`	`+ <!-- init {closure}() -->`
	`38`	`+ <!--`
	`39`	`+ {closure}()`
	`40`	`+ {main} [no active file]`
	`41`	`+ Fiber::start()`
	`42`	`+ {main} %s`
	`43`	`+ -->`
	`44`	`+ <{closure}>`
	`45`	`+ </{closure}>`
	`46`	`+ </Fiber::start>`
	`47`	`+Test completed without crash`
	`48`	`+</file %s>`

Comments

(0)