haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 fix bug in diagnostics_t

pull/2562/head
Niels Lohmann 2021-01-23 20:58:59 +01:00
parent 7b7da08fb6
commit 380a613f2b
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/detail/diagnostics_t.hpp
View File

@ -36,7 +36,7 @@ class diagnostics_t
{
for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
{
if (current->m_parent->m_value.array->operator[](i) == *current)
if (&current->m_parent->m_value.array->operator[](i) == current)
{
tokens.emplace_back(std::to_string(i));
break;
@ -49,7 +49,7 @@ class diagnostics_t
{
for (const auto& element : *current->m_parent->m_value.object)
{
if (element.second == *current)
if (&element.second == current)
{
tokens.emplace_back(element.first.c_str());
break;

4
single_include/nlohmann/json.hpp
View File

@ -2534,7 +2534,7 @@ class diagnostics_t
{
for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
{
if (current->m_parent->m_value.array->operator[](i) == *current)
if (&current->m_parent->m_value.array->operator[](i) == current)
{
tokens.emplace_back(std::to_string(i));
break;
@ -2547,7 +2547,7 @@ class diagnostics_t
{
for (const auto& element : *current->m_parent->m_value.object)
{
if (element.second == *current)
if (&element.second == current)
{
tokens.emplace_back(element.first.c_str());
break;

6
test/src/unit-diagnostics.cpp
View File

@ -95,4 +95,10 @@ TEST_CASE("Better diagnostics")
{
CHECK_THROWS_WITH_AS(json::parse(""), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error);
}
SECTION("Regression test for https://github.com/nlohmann/json/pull/2562#pullrequestreview-574858448")
{
CHECK_THROWS_WITH_AS(json({"0", "0"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
CHECK_THROWS_WITH_AS(json({"0", "1"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
}
}