Skip to content

Fix robustness issue: empty JSON {} in cfg.json or wsec.json #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softhack007 merged 8 commits into from
Apr 5, 2026
Merged

Fix robustness issue: empty JSON {} in cfg.json or wsec.json #355

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae1eed1
Fix robustness issue with empty JSON in cfg.json and wsec.json
Copilot Apr 5, 2026
ba67169
Fix robustness issue with empty presets.json containing only {}
Copilot Apr 5, 2026
abeb8b7
Address code review: cleaner file handle pattern and clarify EEPROM c…
Copilot Apr 5, 2026
5dbd855
Merge branch 'mdev' into copilot/fix-empty-json-issues
softhack007 Apr 5, 2026
215648a
Simplify initPresetsFile: use inline bool empty instead of sz variable
Copilot Apr 5, 2026
6624428
clarify logic in initPresetFile(), raise "empty" threshold to 3 bytes.
softhack007 Apr 5, 2026
eff4bbf
comment clarification
softhack007 Apr 5, 2026
3a0d636
clarify "early return" logic in initPresetsFile()
softhack007 Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wled00/cfg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ void deserializeConfigFromFS() {
DEBUG_PRINTLN(F("Reading settings from /cfg.json..."));

success = readObjectFromFile("/cfg.json", nullptr, &doc);
if (!success) { // if file does not exist, optionally try reading from EEPROM and then save defaults to FS
if (!success || doc.size() == 0) { // if file does not exist or contains only empty JSON (e.g. "{}"), try reading from EEPROM (if supported) and then save defaults to FS
releaseJSONBufferLock();
#ifdef WLED_ADD_EEPROM_SUPPORT
deEEPSettings();
Expand Down Expand Up @@ -1122,7 +1122,7 @@ bool deserializeConfigSec() {
if (!requestJSONBufferLock(3)) return false;

bool success = readObjectFromFile("/wsec.json", nullptr, &doc);
if (!success) {
if (!success || doc.size() == 0) { // treat empty JSON (e.g. "{}") the same as a missing file
releaseJSONBufferLock();
return false;
}
Expand Down
10 changes: 9 additions & 1 deletion wled00/presets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,15 @@ bool getPresetName(byte index, String& name)

void initPresetsFile()
{
if (WLED_FS.exists(getFileName())) return;
if (WLED_FS.exists(getFileName())) {
// treat an empty JSON file (e.g. "{}") the same as a missing file:
// f.size() < 3 is the same threshold used in appendObjectToFile() to detect an uninitialized file
File f = WLED_FS.open(getFileName(), "r");
bool empty = f && f.size() < 3;
Comment thread
softhack007 marked this conversation as resolved.
Outdated
if (f) f.close();
if (!empty) return;
WLED_FS.remove(getFileName()); // remove the empty file so it can be recreated below
}

StaticJsonDocument<64> doc;
JsonObject sObj = doc.to<JsonObject>();
Expand Down
Loading