Skip to content
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

Jump to bottom

Set parent pointers for values inserted via update() (fixes #3007). #3008

Merged
merged 8 commits into from
Sep 12, 2021
Merged

Set parent pointers for values inserted via update() (fixes #3007). #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42b77b5
Set parent pointers for values inserted via update() (fixes #3007).
AnthonyVH Sep 9, 2021
21e645d
Moved test for #3007 to proper file.
AnthonyVH Sep 9, 2021
c9f1a1e
Enable access to private members in diagnostics unit tests.
AnthonyVH Sep 9, 2021
d864232
Make style consistent with rest of code.
AnthonyVH Sep 9, 2021
6f2dce5
Forced amalgamate rerun.
AnthonyVH Sep 9, 2021
40b07f2
Refactor test for #3007 so it doesn't use private members. Also exten…
AnthonyVH Sep 10, 2021
0989a3c
Added fix for #3007 to update(const_iterator, const_iterator) as well.
AnthonyVH Sep 10, 2021
8a14bad
Added failing example code from #3007 as extra test.
AnthonyVH Sep 12, 2021
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
6 changes: 6 additions & 0 deletions include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6009,6 +6009,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = j.cbegin(); it != j.cend(); ++it)
{
m_value.object->operator[](it.key()) = it.value();
#if JSON_DIAGNOSTICS
m_value.object->operator[](it.key()).m_parent = this;
#endif
}
}

Expand Down Expand Up @@ -6069,6 +6072,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = first; it != last; ++it)
{
m_value.object->operator[](it.key()) = it.value();
#if JSON_DIAGNOSTICS
m_value.object->operator[](it.key()).m_parent = this;
#endif
}
}

Expand Down
6 changes: 6 additions & 0 deletions single_include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23414,6 +23414,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = j.cbegin(); it != j.cend(); ++it)
{
m_value.object->operator[](it.key()) = it.value();
#if JSON_DIAGNOSTICS
m_value.object->operator[](it.key()).m_parent = this;
#endif
}
}

Expand Down Expand Up @@ -23474,6 +23477,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = first; it != last; ++it)
{
m_value.object->operator[](it.key()) = it.value();
#if JSON_DIAGNOSTICS
m_value.object->operator[](it.key()).m_parent = this;
#endif
}
}

Expand Down
50 changes: 50 additions & 0 deletions test/src/unit-diagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,54 @@ TEST_CASE("Better diagnostics")
j["second"] = value;
j2["something"] = j;
}

SECTION("Regression test for issue #3007 - Parent pointers properly set when using update()")
{
// void update(const_reference j)
{
json j = json::object();

{
json j2 = json::object();
j2["one"] = 1;

j.update(j2);
}

// Must call operator[] on const element, otherwise m_parent gets updated.
auto const& constJ = j;
CHECK_THROWS_WITH_AS(constJ["one"].at(0), "[json.exception.type_error.304] (/one) cannot use at() with number", json::type_error);
}

// void update(const_iterator first, const_iterator last)
{
json j = json::object();

{
json j2 = json::object();
j2["one"] = 1;

j.update(j2.begin(), j2.end());
}

// Must call operator[] on const element, otherwise m_parent gets updated.
auto const& constJ = j;
CHECK_THROWS_WITH_AS(constJ["one"].at(0), "[json.exception.type_error.304] (/one) cannot use at() with number", json::type_error);
}

// Code from #3007 triggering unwanted assertion without fix to update().
{
json root = json::array();
json lower = json::object();

{
json lowest = json::object();
lowest["one"] = 1;

lower.update(lowest);
}

root.push_back(lower);
}
}
}