jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-16 07:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing parsing only VALID JSON, in the past, when invalid JSON, the WLED runtime would crash

Browse Source
This commit is contained in:
Broersma 2023-11-28 12:04:41 +01:00
parent 71cec39bc4
commit 230af48899
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usermods/usermod_v2_HttpPullLightControl/usermod_v2_HttpPullLightControl.cpp
View File

@ -133,6 +133,9 @@ void HttpPullLightControl::addToConfig(JsonObject& root) {
// Write the configuration parameters to the nested object // Write the configuration parameters to the nested object
top[FPSTR(_enabled)] = enabled; top[FPSTR(_enabled)] = enabled;
if (enabled==false)
// To make it a bit more user-friendly, we unfreeze the main segment after disabling the module. Because individual light control (like for a christmas card) might have been done.
strip.getMainSegment().freeze=false;
top["checkInterval"] = checkInterval; top["checkInterval"] = checkInterval;
#ifndef HTTP_PULL_LIGHT_CONTROL_HIDE_URL #ifndef HTTP_PULL_LIGHT_CONTROL_HIDE_URL
top["url"] = url; top["url"] = url;
@ -281,25 +284,26 @@ void HttpPullLightControl::handleResponse(String& responseStr) {
DEBUG_PRINTLN("Response: "); DEBUG_PRINTLN("Response: ");
DEBUG_PRINTLN(jsonStr); DEBUG_PRINTLN(jsonStr);
// Attempt to deserialize the JSON response // Check for valid JSON, otherwise we brick the program runtime
DeserializationError error = deserializeJson(doc, jsonStr); if (jsonStr[0] == '{' || jsonStr[0] == '[') {
if (error) { // Attempt to deserialize the JSON response
// If there is an error in deserialization, exit the function DeserializationError error = deserializeJson(doc, jsonStr);
DEBUG_PRINT(F("DeserializationError: ")); if (error == DeserializationError::Ok) {
DEBUG_PRINTLN(error.c_str()); // Get JSON object from th doc
return; JsonObject obj = doc.as<JsonObject>();
// Parse the object throuhg deserializeState (use CALL_MODE_NO_NOTIFY or OR CALL_MODE_DIRECT_CHANGE)
deserializeState(obj, CALL_MODE_NO_NOTIFY);
} else {
// If there is an error in deserialization, exit the function
DEBUG_PRINT(F("DeserializationError: "));
DEBUG_PRINTLN(error.c_str());
}
} else {
DEBUG_PRINTLN(F("Invalid JSON response"));
} }
} else { } else {
DEBUG_PRINTLN(F("No body found in the response")); DEBUG_PRINTLN(F("No body found in the response"));
return;
} }
// Get JSON object from th doc
JsonObject obj = doc.as<JsonObject>();
// Parse the object throuhg deserializeState (use CALL_MODE_NO_NOTIFY or OR CALL_MODE_DIRECT_CHANGE)
deserializeState(obj, CALL_MODE_NO_NOTIFY);
// Release the BufferLock again // Release the BufferLock again
releaseJSONBufferLock(); releaseJSONBufferLock();
} }