MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-18 22:13:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Find a bug with multi-command execution, fix crash when data was missing

Browse Source
This commit is contained in:
Lorow
2025-05-10 21:01:39 +02:00
parent 833f69092f
commit 899e00a5fb
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/CommandManager/CommandManager/CommandManager.cpp
View File

@@ -59,19 +59,31 @@ CommandResult CommandManager::executeFromJson(std::string_view json)
{ {
cJSON *parsedJson = cJSON_Parse(json.data()); cJSON *parsedJson = cJSON_Parse(json.data());
if (parsedJson == nullptr) if (parsedJson == nullptr)
return CommandResult::getErrorResult("Invalid JSON"); return CommandResult::getErrorResult("Initial JSON Parse: Invalid JSON");
const cJSON *commandData = nullptr; const cJSON *commandData = nullptr;
const cJSON *commands = cJSON_GetObjectItem(parsedJson, "commands"); const cJSON *commands = cJSON_GetObjectItem(parsedJson, "commands");
// I wrote it in a way that only the first command will be executed
// merge the results of all commands and then return, god damn it
cJSON_ArrayForEach(commandData, commands) cJSON_ArrayForEach(commandData, commands)
{ {
const cJSON *commandTypeString = cJSON_GetObjectItem(commandData, "command"); const cJSON *commandTypeString = cJSON_GetObjectItem(commandData, "command");
if (commandTypeString == nullptr)
{
return CommandResult::getErrorResult("Unknown command - missing command type");
}
const cJSON *commandPayload = cJSON_GetObjectItem(commandData, "data"); const cJSON *commandPayload = cJSON_GetObjectItem(commandData, "data");
auto commandType = commandTypeMap.at(std::string(commandTypeString->valuestring)); auto commandType = commandTypeMap.at(std::string(commandTypeString->valuestring));
std::string commandPayloadString = std::string(cJSON_Print(commandPayload)); std::string commandPayloadString = "";
auto command = createCommand(commandType, commandPayloadString); if (commandPayload != nullptr)
{
std::string commandPayloadString = std::string(cJSON_Print(commandPayload));
}
auto command = createCommand(commandType, commandPayloadString);
if (command == nullptr) if (command == nullptr)
{ {
cJSON_Delete(parsedJson); cJSON_Delete(parsedJson);