Skip to content

[4.6.1] Fixed a crash when accessing an invalid json object #30239

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
wants to merge 1 commit into
base: 4.6.1
Choose a base branch
from
Open

[4.6.1] Fixed a crash when accessing an invalid json object #30239

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
16 changes: 16 additions & 0 deletions src/framework/global/serialization/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,22 +602,38 @@ bool JsonObject::isValid() const

bool JsonObject::empty() const
{
if (!isValid()) {
return true;
}

return object_const(m_data).size() == 0;
}

size_t JsonObject::size() const
{
if (!isValid()) {
return 0;
}

return object_const(m_data).size();
}

bool JsonObject::contains(const std::string& key) const
{
if (!isValid()) {
return false;
}

const picojson::object& o = object_const(m_data);
return o.find(key) != o.cend();
}

JsonValue JsonObject::value(const std::string& key, JsonValue def) const
{
if (!isValid()) {
return def;
}

const picojson::object& o = object_const(m_data);
auto it = o.find(key);
if (it != o.cend()) {
Expand Down
Loading