josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix diveSubfolder string termination

This commit is contained in:
Voinea Dragos 2021-01-31 16:42:01 +02:00
parent 2dfe21358f
commit f343e6432a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/cardreader.cpp
View File

@ -340,9 +340,9 @@ void CardReader::diveSubfolder (const char *fileName, SdFile& dir)
{ {
const size_t maxLen = 12; const size_t maxLen = 12;
char subdirname[maxLen+1]; char subdirname[maxLen+1];
subdirname[maxLen] = 0;
const size_t len = ((static_cast<size_t>(dirname_end-dirname_start))>maxLen) ? maxLen : (dirname_end-dirname_start); const size_t len = ((static_cast<size_t>(dirname_end-dirname_start))>maxLen) ? maxLen : (dirname_end-dirname_start);
strncpy(subdirname, dirname_start, len); strncpy(subdirname, dirname_start, len);
subdirname[len] = 0;
SERIAL_ECHOLN(subdirname); SERIAL_ECHOLN(subdirname);
if (!dir.open(curDir, subdirname, O_READ)) if (!dir.open(curDir, subdirname, O_READ))
{ {