Commit c87face

committed

Fix printing backtrace during generator closing

1 parent 422aa17 commit c87faceCopy full SHA for c87face

File tree

+46

-6

lines changed

+46

-6

lines changed

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,28 @@`
	`1`	`+--TEST--`
	`2`	`+GH-15851: Access on NULL when printing backtrace with freed generator`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+`
	`6`	`+class Foo {`
	`7`	`+ public function __destruct() {`
	`8`	`+ debug_print_backtrace();`
	`9`	`+ }`
	`10`	`+}`
	`11`	`+`
	`12`	`+function bar() {`
	`13`	`+ yield from foo();`
	`14`	`+}`
	`15`	`+`
	`16`	`+function foo() {`
	`17`	`+ $foo = new Foo();`
	`18`	`+ yield;`
	`19`	`+}`
	`20`	`+`
	`21`	`+$gen = bar();`
	`22`	`+foreach ($gen as $dummy);`
	`23`	`+`
	`24`	`+?>`
	`25`	`+--EXPECTF--`
	`26`	`+#0 %s(%d): Foo->__destruct()`
	`27`	`+#1 %s(%d): foo()`
	`28`	`+#2 %s(%d): bar()`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4548,11 +4548,13 @@ ZEND_VM_HANDLER(161, ZEND_GENERATOR_RETURN, CONST\|TMP\|VAR\|CV, ANY, SPEC(OBSERVER`
`4548`	`4548`
`4549`	`4549`	`ZEND_OBSERVER_FCALL_END(generator->execute_data, &generator->retval);`
`4550`	`4550`
`4551`		`- EG(current_execute_data) = EX(prev_execute_data);`
	`4551`	`+ zend_execute_data*prev_execute_data = EX(prev_execute_data);`
`4552`	`4552`
`4553`	`4553`	`/* Close the generator to free up resources */`
`4554`	`4554`	`zend_generator_close(generator, 1);`
`4555`	`4555`
	`4556`	`+ EG(current_execute_data) = prev_execute_data;`
	`4557`	`+`
`4556`	`4558`	`/* Pass execution back to handling code */`
`4557`	`4559`	`ZEND_VM_RETURN();`
`4558`	`4560`	`}`

Lines changed: 15 additions & 5 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)