Skip to content

fix: validate __type field before accessing in fromJson #1009

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
merged 1 commit into from
Sep 11, 2025
Merged

fix: validate __type field before accessing in fromJson #1009

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
15 changes: 13 additions & 2 deletions src/json_export.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,20 @@ JsonExporter::ExpectedEntry JsonExporter::fromJson(const nlohmann::json& source)
}
}

if(!source.contains("__type") && !source.is_array())
if(source.is_array())
{
return nonstd::make_unexpected("Missing field '__type'");
if(source.empty())
return nonstd::make_unexpected("Missing field '__type'");
const auto& first = source[0];
if(!first.is_object() || !first.contains("__type"))
return nonstd::make_unexpected("Missing field '__type'");
if(!first["__type"].is_string())
return nonstd::make_unexpected("Invalid '__type' (must be string)");
}
else
{
if(!source.is_object() || !source.contains("__type") || !source["__type"].is_string())
return nonstd::make_unexpected("Missing field '__type'");
}

auto& from_converters =
Expand Down
Loading