Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

enumerateLedmaps improvements

Browse Source 
improve reading on ledmap names
* remove trailing " " "," "\r"
* clear buffer between reads
* fix for a 1-byte buffer overflow
This commit is contained in:
Frank
2023-06-08 22:26:55 +02:00
parent 3560b27dc1
commit 23ea201b43
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wled00/FX_fcn.cpp
View File

@@ -1392,16 +1392,16 @@ void WS2812FX::enumerateLedmaps() {
f = WLED_FS.open(fileName, "r"); f = WLED_FS.open(fileName, "r");
if (f) { if (f) {
f.find("\"n\":"); f.find("\"n\":");
char name[33]; char name[34] = { '\0' }; // ensure string termination
f.readBytesUntil('\n', name, sizeof(name)); f.readBytesUntil('\n', name, sizeof(name)-1);
size_t len = 0; size_t len = strlen(name);
if (name != nullptr) { if (len > 0 && len < 33) {
len = strlen(name); if ((len > 0) && (name[len-1] == '\r')) { name[len-1] = '\0'; len--;} // kill trailing `\r` (DOS format: \r\n)
if (len > 0 && len < 33) { if ((len > 0) && (name[len-1] == ',')) { name[len-1] = '\0'; len--;} // kill trailing `,`
ledmapNames[i-1] = new char[len+1]; if ((len > 0) && (name[len-1] == ' ')) { name[len-1] = '\0'; len--;} // kill trailing ` `
if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, 33); ledmapNames[i-1] = new char[len+1]; // +1 to include terminating \0
} if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, 33);
} }
if (!ledmapNames[i-1]) { if (!ledmapNames[i-1]) {
char tmp[33]; char tmp[33];
@@ -1412,18 +1412,20 @@ void WS2812FX::enumerateLedmaps() {
} }
//WLEDMM calc ledmapMaxSize (TroyHack) //WLEDMM calc ledmapMaxSize (TroyHack)
char dim[33]; char dim[34] = { '\0' };
f.find("\"width\":"); f.find("\"width\":");
f.readBytesUntil('\n', dim, sizeof(dim)); //hack: use fileName as we have this allocated already f.readBytesUntil('\n', dim, sizeof(dim)-1); //hack: use fileName as we have this allocated already
uint16_t maxWidth = atoi(dim); uint16_t maxWidth = atoi(dim);
f.find("\"height\":"); f.find("\"height\":");
f.readBytesUntil('\n', dim, sizeof(dim)); memset(dim, 0, sizeof(dim)); // clear buffer before reading
f.readBytesUntil('\n', dim, sizeof(dim)-1);
uint16_t maxHeight = atoi(dim); uint16_t maxHeight = atoi(dim);
ledmapMaxSize = MAX(ledmapMaxSize, maxWidth * maxHeight); ledmapMaxSize = MAX(ledmapMaxSize, maxWidth * maxHeight);
USER_PRINTF("enumerateLedmaps %s %s (%dx%d -> %d)\n", fileName, name, maxWidth, maxHeight, ledmapMaxSize); USER_PRINTF("enumerateLedmaps %s %s (%dx%d -> %d)\n", fileName, name, maxWidth, maxHeight, ledmapMaxSize);
} }
f.close(); f.close();
USER_FLUSH();
releaseJSONBufferLock(); releaseJSONBufferLock();
} }
#endif #endif