Fix longFilename NULL pointer dereference #20115
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
|
@LinFor I only tested this with my "normal" case, I didn't do anything to verify that the UTF-8 conversion still works properly. Please take a look and let me know what you think. |
sjasonsmith
commented
Nov 12, 2020
sjasonsmith
commented
Nov 12, 2020
LinFor
approved these changes
Nov 12, 2020
LinFor
approved these changes
Nov 12, 2020
FhlostonParadise
pushed a commit
to FhlostonParadise/Marlin
that referenced
this pull request
Nov 21, 2020
Kannix2005
pushed a commit
to Kannix2005/Marlin-1
that referenced
this pull request
Dec 7, 2020
vgadreau
pushed a commit
to vgadreau/Marlin
that referenced
this pull request
Dec 9, 2020
tharts
pushed a commit
to tharts/Marlin
that referenced
this pull request
Jan 6, 2021
dpreed
pushed a commit
to dpreed/Marlin_2.0.x
that referenced
this pull request
Feb 5, 2021
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
thinkyhead
pushed a commit
that referenced
this pull request
Apr 30, 2021
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.
Description
SdBaseFile::readDiris sometimes called with a null longFilename pointer. This is certainly true when working with a RepRapDiscountFullGraphics display.This checks the pointer value prior to attempting to use it.
Benefits
Avoid crash on boot.
Configurations
I tested this in the simulator using the files in the following zip file. The SD image has to be placed in the folder next to the executable.
Marlin.zip
There is also a config in the linked issue.
Related Issues
#20114 - UTF_FILENAME_SUPPORT