mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 19:02:35 +02:00
Code Issues Releases Wiki Activity

Fix memory leak when answering webcommand (regression issue)

Browse Source 
Fix wrong error code on  web command (regression issue)
This commit is contained in:
Luc
2021-03-04 13:43:33 +01:00
parent 62193c3988
commit 28592a3ed1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Grbl_Esp32/src/WebUI/WebServer.cpp
View File

@@ -480,10 +480,11 @@ namespace WebUI {
} }
} }
if (silent || !espresponse->anyOutput()) { if (silent || !espresponse->anyOutput()) {
_webserver->send(err != Error::Ok ? 401 : 200, "text/plain", answer); _webserver->send(err != Error::Ok ? 500 : 200, "text/plain", answer);
} else { } else {
espresponse->flush(); espresponse->flush();
} }
if(espresponse) delete(espresponse);
} else { //execute GCODE } else { //execute GCODE
if (auth_level == AuthenticationLevel::LEVEL_GUEST) { if (auth_level == AuthenticationLevel::LEVEL_GUEST) {
_webserver->send(401, "text/plain", "Authentication failed!\n"); _webserver->send(401, "text/plain", "Authentication failed!\n");
@@ -491,7 +492,7 @@ namespace WebUI {
} }
//Instead of send several commands one by one by web / send full set and split here //Instead of send several commands one by one by web / send full set and split here
String scmd; String scmd;
const char* res = ""; bool hasError =false;
uint8_t sindex = 0; uint8_t sindex = 0;
// TODO Settings - this is very inefficient. get_Splited_Value() is O(n^2) // TODO Settings - this is very inefficient. get_Splited_Value() is O(n^2)
// when it could easily be O(n). Also, it would be just as easy to push // when it could easily be O(n). Also, it would be just as easy to push
@@ -512,10 +513,10 @@ namespace WebUI {
scmd += "\n"; scmd += "\n";
} }
if (!Serial2Socket.push(scmd.c_str())) { if (!Serial2Socket.push(scmd.c_str())) {
res = "Error"; hasError = true;
} }
} }
_webserver->send(200, "text/plain", res); _webserver->send(200, "text/plain", hasError?"Error":"");
} }
} }