Merge pull request #620 from dukess/master

Fix: overwrite buffer in cleanupDatalog()
fredlcore · Feb 25, 2024 · 32eeec3 · 32eeec3
2 parents 441eba2 + 833ea2c
commit 32eeec3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
@@ -6551,7 +6551,11 @@ next_parameter:
             } else if (p[2]=='K') { //--- clean up datalog, keeping only the most recent n days
               int nDays;
               if (sscanf(p+3,"%d",&nDays)==1 && nDays>0) {
-                printFmtToWebClient("\r\n%s\r\n",cleanupDatalog(nDays));
+                // We should flush all characters to client and use errormsgptr
+                // beacuse cleanupDatalog() and printFmtToWebClient() use same buffer;
+                flushToWebClient();
+                const char *errormsgptr = cleanupDatalog(nDays);
+                printFmtToWebClient("\r\n%s\r\n", errormsgptr);
                 // cleanup after failed cleanupDatalog(), if necessary:
                 SD.remove(datalogTemporaryFileName);
                 SD.remove(datalogIndexTemporaryFileName);