Fix NULL pointer dereference in SDL_GlobStorageDirectory #14330
Merged
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
Collaborator
|
Merged, thanks! |
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.
Problem:
When SDL_OpenFileStorage(NULL) is called with a NULL base path (which is explicitly allowed by the API),
calling SDL_GlobStorageDirectory on that storage causes a segmentation fault.
The crash occurs in GENERIC_EnumerateStorageDirectory at line 82 where SDL_strlen is called on the NULL userdata pointer without checking if it's NULL first.
Solution:
Add a NULL check before calling SDL_strlen on the userdata pointer.
If userdata is NULL, set base_len to 0, otherwise calculate the length normally.
This matches the pattern used by GENERIC_INTERNAL_CreateFullPath which already handles NULL base paths correctly.
Happy to hear any feedback you might have.
Hope you're having a great day!
Fixes #14060