Skip to content

Don’t reset func in zend_closure_internal_handler - #9823

Closed
rioderelfte wants to merge 2 commits into
php:PHP-8.2from
rioderelfte:dont-reset-func-in-closure
Closed

rioderelfte wants to merge 2 commits into
php:PHP-8.2from
rioderelfte:dont-reset-func-in-closure

Conversation

@rioderelfte

Copy link
Copy Markdown
Contributor

The pointer is used in _zend_observe_fcall_begin().

The new test segfaulted before the change.

The pointer is used in _zend_observe_fcall_begin().
@rioderelfte
rioderelfte changed the base branch from master to PHP-8.2 October 24, 2022 19:50
@iluuu1994
iluuu1994 requested a review from bwoebi October 24, 2022 23:13

@bwoebi bwoebi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks right to me, all other occurrences of EX(func) = NULL; are trampolines, but that particular one doesn't seem so. Good catch.

@bwoebi

bwoebi commented Oct 26, 2022

Copy link
Copy Markdown
Member

Merged via b9474bf.

@bwoebi bwoebi closed this Oct 26, 2022
@rioderelfte
rioderelfte deleted the dont-reset-func-in-closure branch October 29, 2022 09:50
@rioderelfte
rioderelfte restored the dont-reset-func-in-closure branch October 29, 2022 10:07
@rioderelfte
rioderelfte deleted the dont-reset-func-in-closure branch October 29, 2022 10:09
@rioderelfte
rioderelfte restored the dont-reset-func-in-closure branch October 29, 2022 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants