Relax possible E_ERROR condition to an Error exception #17285
Merged
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
Girgias
approved these changes
Dec 27, 2024
ext/spl/spl_directory.c
Outdated
| @@ -1600,8 +1600,7 @@ PHP_METHOD(GlobIterator, count) | |||
| RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL)); | |||
| } else { | |||
| /* This can happen by abusing destructors. */ | |||
| /* TODO: relax this from E_ERROR to an exception */ | |||
| php_error_docref(NULL, E_ERROR, "GlobIterator lost glob state"); | |||
| zend_throw_error(NULL, "GlobIterator lost glob state"); | |||
There was a problem hiding this comment.
Do we want to improve the error message? Also can you add a test to trigger this.
|
@Girgias I just found out that it is actually impossible... The reason being that there's a get_method hook that checks the validity of the object. The reason this crashed in the other PR is because it was on a property instead of on a method, which isn't checked the same way. So I just replaced the code with an assertion and explanation comment. |
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.
See #17231