Fix PHP 8.5 recursive tokenization during token_get_all
#19547
Closed
+67
−0
Conversation
This file contains hidden or 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
TimWolla
reviewed
Aug 21, 2025
TimWolla
reviewed
Aug 21, 2025
arnaud-lb
reviewed
Aug 22, 2025
| @@ -766,6 +769,8 @@ ZEND_API void zend_prepare_string_for_scanning(zval *str, zend_string *filename) | |||
| zend_set_compiled_filename(filename); | |||
| CG(zend_lineno) = 1; | |||
| CG(increment_lineno) = 0; | |||
| SCNG(on_event) = NULL; | |||
| SCNG(on_event_context) = NULL; | |||
There was a problem hiding this comment.
Please also reset SCNG(on_event_context) here:
php-src/Zend/zend_language_scanner.l
Line 2761 in 43a7a9a
|
Please also add a test where the error handler throws an exception |
Co-authored-by: Arnaud Le Blanc <[email protected]>
|
Thank you @kubawerlos! |
mvorisek
reviewed
Aug 22, 2025
| @@ -1636,6 +1641,9 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_ | |||
| <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("integer"){TABS_AND_SPACES}")" { | |||
| if (PARSER_MODE()) { | |||
| zend_error(E_DEPRECATED, "Non-canonical cast (integer) is deprecated, use the (int) cast instead"); | |||
| if (PARSER_MODE() && EG(exception)) { | |||
There was a problem hiding this comment.
PARSER_MODE() condition not required, checked already above.
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.
Fixes #19507
Changes for the fix are authored by @arnaud-lb in #19507 (comment).
@arnaud-lb, if you were planning to raise the PR by yourself, feel free to close this PR and do it.