Fix GH-17225: NULL deref in spl_directory.c #17231
Closed
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
NULL checks for the glob stream are inconsistently applied. To solve this generally, factor it out to a helper function so it's less likely to be forgotten in the future.
cmb69
approved these changes
Dec 21, 2024
| static inline bool spl_intern_is_glob(const spl_filesystem_object *intern) | ||
| { | ||
| /* NULL check on `dirp` is necessary as destructors may interfere. */ | ||
| return intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops); |
There was a problem hiding this comment.
nit:
Suggested change
| return intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops); | |
| return intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp, &php_glob_stream_ops); |
There was a problem hiding this comment.
ah right, I didn't reformat the code when I moved this
|
Thank you for fixing this! Now I know that the E_ERROR can actually happen. |
charmitro
pushed a commit
to wasix-org/php
that referenced
this pull request
Mar 13, 2025
NULL checks for the glob stream are inconsistently applied. To solve this generally, factor it out to a helper function so it's less likely to be forgotten in the future. Closes phpGH-17231.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
NULL checks for the glob stream are inconsistently applied. To solve this generally, factor it out to a helper function so it's less likely to be forgotten in the future.