External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🥅 add assertion for invariant in SAX-DOM parser

Browse Source
This commit is contained in:
Niels Lohmann 2022-05-17 10:53:40 +02:00
parent a8a547d7a2
commit d5e34ecfe5
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/nlohmann/detail/input/json_sax.hpp
View File

@ -233,6 +233,9 @@ class json_sax_dom_parser
bool key(string_t& val) bool key(string_t& val)
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_object());
// add null at given key and store the reference for later // add null at given key and store the reference for later
object_element = &(ref_stack.back()->m_value.object->operator[](val)); object_element = &(ref_stack.back()->m_value.object->operator[](val));
return true; return true;
@ -240,6 +243,9 @@ class json_sax_dom_parser
bool end_object() bool end_object()
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_object());
ref_stack.back()->set_parents(); ref_stack.back()->set_parents();
ref_stack.pop_back(); ref_stack.pop_back();
return true; return true;
@ -259,6 +265,9 @@ class json_sax_dom_parser
bool end_array() bool end_array()
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_array());
ref_stack.back()->set_parents(); ref_stack.back()->set_parents();
ref_stack.pop_back(); ref_stack.pop_back();
return true; return true;

9
single_include/nlohmann/json.hpp
View File

@ -6230,6 +6230,9 @@ class json_sax_dom_parser
bool key(string_t& val) bool key(string_t& val)
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_object());
// add null at given key and store the reference for later // add null at given key and store the reference for later
object_element = &(ref_stack.back()->m_value.object->operator[](val)); object_element = &(ref_stack.back()->m_value.object->operator[](val));
return true; return true;
@ -6237,6 +6240,9 @@ class json_sax_dom_parser
bool end_object() bool end_object()
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_object());
ref_stack.back()->set_parents(); ref_stack.back()->set_parents();
ref_stack.pop_back(); ref_stack.pop_back();
return true; return true;
@ -6256,6 +6262,9 @@ class json_sax_dom_parser
bool end_array() bool end_array()
{ {
JSON_ASSERT(!ref_stack.empty());
JSON_ASSERT(ref_stack.back()->is_array());
ref_stack.back()->set_parents(); ref_stack.back()->set_parents();
ref_stack.pop_back(); ref_stack.pop_back();
return true; return true;