fix: Harden files scanner for invalid null access #50436
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
susnux
added
bug
3. to review
|
/backport to stable31 |
4 tasks
|
Stable30 and stable29 differ a bit, so their PR is here: #50437 |
susnux
force-pushed
the
fix/encoding-wrapper-scanner
branch
from
c53892b to
12d0806
Compare
provokateurin
approved these changes
Jan 26, 2025
Comment on lines
+181
to
+182
| $cacheData = $cacheData ?? $this->cache->get($file); | ||
| if ($reuseExisting && $cacheData !== false && isset($cacheData['fileid'])) { |
There was a problem hiding this comment.
In theory $cacheData can never be null based on the logic and the return type of Cache::get(), but looking at the backing code I wouldn't be so sure that it really never returns null, so maybe add a check for null as well.
| $data['fileid'] = $this->addToCache($file, $newData, $fileId); | ||
| } | ||
|
|
||
| if ($cacheData !== false) { |
There was a problem hiding this comment.
Here again, maybe check for null as well.
susnux
force-pushed
the
fix/encoding-wrapper-scanner
branch
from
484b509 to
53815b3
Compare
come-nc
approved these changes
Jan 27, 2025
susnux
force-pushed
the
fix/encoding-wrapper-scanner
branch
2 times, most recently
from
3ed5a56 to
75fb094
Compare
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
susnux
force-pushed
the
fix/encoding-wrapper-scanner
branch
from
578af46 to
b48ee2e
Compare
Merged
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.
Summary
Checklist