Mirror/esp32-cam-webserver
1
0
Fork 0
mirror of https://github.com/easytarget/esp32-cam-webserver.git synced 2024-02-16 18:18:24 +08:00
Code Issues Projects Releases Wiki Activity

Handle corrupt preferences files (#129)

Browse Source
This commit is contained in:
Owen Carter
2021-06-30 18:22:51 +02:00
committed by GitHub
parent b33f9258e9
commit 55b091ea7c
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
storage.cpp
View File

@ -47,7 +47,11 @@ void dumpPrefs(fs::FS &fs){
if (fs.exists(PREFERENCES_FILE)) { if (fs.exists(PREFERENCES_FILE)) {
// Dump contents for debug // Dump contents for debug
File file = fs.open(PREFERENCES_FILE, FILE_READ); File file = fs.open(PREFERENCES_FILE, FILE_READ);
while (file.available()) Serial.print(char(file.read())); int countSize = 0;
while (file.available() && countSize <= PREFERENCES_MAX_SIZE) {
Serial.print(char(file.read()));
countSize++;
}
Serial.println(""); Serial.println("");
file.close(); file.close();
} else { } else {
@ -62,15 +66,25 @@ void loadPrefs(fs::FS &fs){
Serial.printf("Loading preferences from file %s\r\n", PREFERENCES_FILE); Serial.printf("Loading preferences from file %s\r\n", PREFERENCES_FILE);
File file = fs.open(PREFERENCES_FILE, FILE_READ); File file = fs.open(PREFERENCES_FILE, FILE_READ);
if (!file) { if (!file) {
Serial.println("Failed to open preferences file"); Serial.println("Failed to open preferences file for reading, maybe corrupt, removing");
removePrefs(SPIFFS);
return; return;
} }
size_t size = file.size(); size_t size = file.size();
if (size > 800) { if (size > PREFERENCES_MAX_SIZE) {
Serial.println("Preferences file size is too large, maybe corrupt"); Serial.println("Preferences file size is too large, maybe corrupt, removing");
removePrefs(SPIFFS);
return; return;
} }
while (file.available()) prefs += char(file.read()); while (file.available()) {
prefs += char(file.read());
if (prefs.length() > size) {
// corrupted SPIFFS files can return data beyond their declared size.
Serial.println("Preferences file failed to load properly, appears to be corrupt, removing");
removePrefs(SPIFFS);
return;
}
}
// get sensor reference // get sensor reference
sensor_t * s = esp_camera_sensor_get(); sensor_t * s = esp_camera_sensor_get();
// process all the settings // process all the settings

1
storage.h
View File

@ -2,6 +2,7 @@
#include "SPIFFS.h" #include "SPIFFS.h"
#define FORMAT_SPIFFS_IF_FAILED true #define FORMAT_SPIFFS_IF_FAILED true
#define PREFERENCES_MAX_SIZE 500
#define PREFERENCES_FILE "/esp32cam-preferences.json" #define PREFERENCES_FILE "/esp32cam-preferences.json"