lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing a potential stack corruption

Browse Source 
.. overlooked this one when reviewing the PR.
@blazoncek, @ctjet : three questions on the new code remain, because its not clear to me if its correct. Please check.
This commit is contained in:
Frank 2023-01-03 14:17:42 +01:00
parent 4a09e18d9a
commit faf616cbea
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wled00/set.cpp
View File

@ -655,9 +655,12 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
strip.panel.reserve(strip.panels); // pre-allocate memory
for (uint8_t i=0; i<strip.panels; i++) {
WS2812FX::Panel p;
char pO[8]; sprintf_P(pO, PSTR("P%d"), i);
uint8_t l = strlen(pO); pO[l+1] = 0;
pO[l] = 'B'; if (!request->hasArg(pO)) break;
char pO[8] = { '\0' };
snprintf_P(pO, 7, PSTR("P%d"), i);
pO[7] = '\0';
uint8_t l = strlen(pO);
// softhack007: please check if the code below is correct. The first element is pO[0], so maybe you want to modify pO[l-1]?
pO[l] = 'B'; if (!request->hasArg(pO)) break; // softhack007: this line looks suspicious to me .. break() aborts the loop .. maybe you need continue()?
pO[l] = 'B'; p.bottomStart = request->arg(pO).toInt();
pO[l] = 'R'; p.rightStart = request->arg(pO).toInt();
pO[l] = 'V'; p.vertical = request->arg(pO).toInt();

7
wled00/xml.cpp
View File

@ -744,8 +744,11 @@ void getSettingsJS(byte subPage, char* dest)
oappend(SET_F("addPanel("));
oappend(itoa(i,n,10));
oappend(SET_F(");"));
char pO[8]; sprintf_P(pO, PSTR("P%d"), i);
uint8_t l = strlen(pO); pO[l+1] = 0;
char pO[8] = { '\0' };
snprintf_P(pO, 7, PSTR("P%d"), i);
pO[7] = '\0';
uint8_t l = strlen(pO);
// softhack007: please check if the code below is correct. The first element is pO[0], so maybe you want to modify pO[l-1]?
pO[l] = 'B'; sappend('v',pO,strip.panel[i].bottomStart);
pO[l] = 'R'; sappend('v',pO,strip.panel[i].rightStart);
pO[l] = 'V'; sappend('v',pO,strip.panel[i].vertical);