Browse Source

[2.0.x] Fix null check in lsDive (#10978)

pull/1/head
Giuliano 7 years ago
committed by Scott Lahteine
parent
commit
e970e429b6
  1. 4
      Marlin/src/sd/cardreader.cpp

4
Marlin/src/sd/cardreader.cpp

@ -110,8 +110,8 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
createFilename(dosFilename, p); createFilename(dosFilename, p);
// Allocate enough stack space for the full path to a folder, trailing slash, and nul // Allocate enough stack space for the full path to a folder, trailing slash, and nul
bool prepend_is_empty = (prepend[0] == '\0'); const bool prepend_is_empty = (!prepend || prepend[0] == '\0');
int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(dosFilename) + 1 + 1; const int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(dosFilename) + 1 + 1;
char path[len]; char path[len];
// Append the FOLDERNAME12/ to the passed string. // Append the FOLDERNAME12/ to the passed string.

Loading…
Cancel
Save