Fix #2030: Segmentation fault with autoloaders bailing out #2037
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We fix this issue by ensuring that the opline is always connected to its proper execute_data and popping newer entries if they aren't matching. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
| --TEST-- | ||
| Assert bailouts are gracefully handled within class autoloading | ||
| --SKIPIF-- | ||
| <?php if (PHP_VERSION_ID >= 70300 && PHP_VERSION_ID < 70400) die('skip: Bailing out in autoloaders is fundamentally broken in PHP 7.3'); ?> |
There was a problem hiding this comment.
question (non-blocking): What would be the expected behaviour in PHP 7.3, segfault?
Do we document such things somewhere, just in case another customer experiences this problem?
There was a problem hiding this comment.
Yes, this segfaults. It's plain and simple a bug in PHP 7.3 itself.
For now I'm not aware of such documentation.
morrisonlevi
approved these changes
May 8, 2023
| } | ||
| if (prev_exception_hook) { | ||
| prev_exception_hook(ex); | ||
| } | ||
| } | ||
|
|
||
| void zai_interceptor_reset_resolver() { |
There was a problem hiding this comment.
Minor nit.
Suggested change
| void zai_interceptor_reset_resolver() { | |
| void zai_interceptor_reset_resolver(void) { |
| } | ||
| if (prev_exception_hook) { | ||
| prev_exception_hook(ex); | ||
| } | ||
| } | ||
|
|
||
| void zai_interceptor_reset_resolver() { |
There was a problem hiding this comment.
And matching nit.
Suggested change
| void zai_interceptor_reset_resolver() { | |
| void zai_interceptor_reset_resolver(void) { |
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We fix this issue by ensuring that the opline is always connected to its proper execute_data and popping newer entries if they aren't matching.
Note for the reviewer: the PHP 7 and PHP 8 changes are identical.
Readiness checklist
Reviewer checklist