Skip to content

fix(sirens): safely parse siren states whether defined as array or object #381

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

Open
CanerKaraca23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sirens): safely parse siren states whether defined as array or object #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 28 additions & 8 deletions src/features/sirens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,21 +551,41 @@ VehicleSirenData::VehicleSirenData(const nlohmann::json &json)
}
}

for (nlohmann::json::const_iterator stateObject = states.begin(); stateObject != states.end(); ++stateObject)
if (states.is_object())
{
VehicleSirenState *state = new VehicleSirenState(stateObject.key(), stateObject.value());

if (!state->Validate)
for (nlohmann::json::const_iterator stateObject = states.begin(); stateObject != states.end(); ++stateObject)
{
LOG_VERBOSE("Failed to set up state {}, could not configure object from manifest!", stateObject.key());
VehicleSirenState *state = new VehicleSirenState(stateObject.key(), stateObject.value());

continue;
if (!state->Validate)
{
LOG_VERBOSE("Failed to set up state {}, could not configure object from manifest!", stateObject.key());
delete state;
continue;
}

States.push_back(state);
}
}
else if (states.is_array())
{
int idx = 0;
for (nlohmann::json::const_iterator stateObject = states.begin(); stateObject != states.end(); ++stateObject, ++idx)
{
VehicleSirenState *state = new VehicleSirenState(std::to_string(idx), stateObject.value());

States.push_back(state);
if (!state->Validate)
{
LOG_VERBOSE("Failed to set up state {}, could not configure object from manifest!", idx);
delete state;
continue;
}

States.push_back(state);
}
}

Validate = true;
Validate = !States.empty();
};

void Sirens::Parse(const nlohmann::json &data, int model)
Expand Down