mirror of
https://github.com/nlohmann/json.git
synced 2026-09-07 16:57:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32349b379b |
@@ -748,6 +748,20 @@ class json_pointer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// the reference token consists only of digits at this point (cf. checks
|
||||||
|
// above); however, its numeric value might not be representable, in which
|
||||||
|
// case array_index() would throw out_of_range.404/410 -- contains() must
|
||||||
|
// not throw (see #5395), so such a reference token is treated as "not found"
|
||||||
|
errno = 0; // strtoull() does not reset errno on success
|
||||||
|
char* p_end = nullptr; // NOLINT(misc-const-correctness)
|
||||||
|
const unsigned long long magnitude = std::strtoull(reference_token.c_str(), &p_end, 10); // NOLINT(runtime/int)
|
||||||
|
if (JSON_HEDLEY_UNLIKELY(errno == ERANGE // the value exceeds ULLONG_MAX
|
||||||
|
|| magnitude >= static_cast<unsigned long long>((std::numeric_limits<typename BasicJsonType::size_type>::max)()))) // NOLINT(runtime/int)
|
||||||
|
{
|
||||||
|
// the array index cannot be represented as size_type
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const auto idx = array_index<BasicJsonType>(reference_token);
|
const auto idx = array_index<BasicJsonType>(reference_token);
|
||||||
if (idx >= ptr->size())
|
if (idx >= ptr->size())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ class serializer
|
|||||||
, thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
|
, thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
|
||||||
, decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
|
, decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
|
||||||
, indent_char(ichar)
|
, indent_char(ichar)
|
||||||
, indent_string()
|
, indent_string(512, indent_char)
|
||||||
, error_handler(error_handler_)
|
, error_handler(error_handler_)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@@ -126,10 +126,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -203,10 +199,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -268,10 +260,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -1022,7 +1010,7 @@ class serializer
|
|||||||
|
|
||||||
/// the indentation character
|
/// the indentation character
|
||||||
const char indent_char;
|
const char indent_char;
|
||||||
/// the indentation string (lazily allocated on first use by a pretty-print branch)
|
/// the indentation string
|
||||||
string_t indent_string;
|
string_t indent_string;
|
||||||
|
|
||||||
/// error_handler how to react on decoding errors
|
/// error_handler how to react on decoding errors
|
||||||
|
|||||||
@@ -16394,6 +16394,20 @@ class json_pointer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// the reference token consists only of digits at this point (cf. checks
|
||||||
|
// above); however, its numeric value might not be representable, in which
|
||||||
|
// case array_index() would throw out_of_range.404/410 -- contains() must
|
||||||
|
// not throw (see #5395), so such a reference token is treated as "not found"
|
||||||
|
errno = 0; // strtoull() does not reset errno on success
|
||||||
|
char* p_end = nullptr; // NOLINT(misc-const-correctness)
|
||||||
|
const unsigned long long magnitude = std::strtoull(reference_token.c_str(), &p_end, 10); // NOLINT(runtime/int)
|
||||||
|
if (JSON_HEDLEY_UNLIKELY(errno == ERANGE // the value exceeds ULLONG_MAX
|
||||||
|
|| magnitude >= static_cast<unsigned long long>((std::numeric_limits<typename BasicJsonType::size_type>::max)()))) // NOLINT(runtime/int)
|
||||||
|
{
|
||||||
|
// the array index cannot be represented as size_type
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const auto idx = array_index<BasicJsonType>(reference_token);
|
const auto idx = array_index<BasicJsonType>(reference_token);
|
||||||
if (idx >= ptr->size())
|
if (idx >= ptr->size())
|
||||||
{
|
{
|
||||||
@@ -20150,7 +20164,7 @@ class serializer
|
|||||||
, thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
|
, thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
|
||||||
, decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
|
, decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
|
||||||
, indent_char(ichar)
|
, indent_char(ichar)
|
||||||
, indent_string()
|
, indent_string(512, indent_char)
|
||||||
, error_handler(error_handler_)
|
, error_handler(error_handler_)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@@ -20205,10 +20219,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -20282,10 +20292,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -20347,10 +20353,6 @@ class serializer
|
|||||||
|
|
||||||
// variable to hold indentation for recursive calls
|
// variable to hold indentation for recursive calls
|
||||||
const auto new_indent = current_indent + indent_step;
|
const auto new_indent = current_indent + indent_step;
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.empty()))
|
|
||||||
{
|
|
||||||
indent_string.resize(512, indent_char);
|
|
||||||
}
|
|
||||||
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
|
||||||
{
|
{
|
||||||
indent_string.resize(indent_string.size() * 2, ' ');
|
indent_string.resize(indent_string.size() * 2, ' ');
|
||||||
@@ -21101,7 +21103,7 @@ class serializer
|
|||||||
|
|
||||||
/// the indentation character
|
/// the indentation character
|
||||||
const char indent_char;
|
const char indent_char;
|
||||||
/// the indentation string (lazily allocated on first use by a pretty-print branch)
|
/// the indentation string
|
||||||
string_t indent_string;
|
string_t indent_string;
|
||||||
|
|
||||||
/// error_handler how to react on decoding errors
|
/// error_handler how to react on decoding errors
|
||||||
|
|||||||
@@ -319,6 +319,44 @@ TEST_CASE("JSON pointers")
|
|||||||
|
|
||||||
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
|
||||||
|
// #5395: contains() must not throw for a reference token that is a
|
||||||
|
// syntactically valid array index but numerically exceeds ULLONG_MAX
|
||||||
|
// (causing strtoull() to set errno to ERANGE) -- it should just report
|
||||||
|
// that the pointer does not resolve to an element
|
||||||
|
CHECK(!j.contains(jp));
|
||||||
|
CHECK(!j_const.contains(jp));
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// #5395: same as above, but using the exact reproduction from the issue
|
||||||
|
json::json_pointer const jp("/99999999999999999999");
|
||||||
|
std::string const throw_msg = "[json.exception.out_of_range.404] unresolved reference token '99999999999999999999'";
|
||||||
|
|
||||||
|
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j.at(jp) = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j_const.at(jp) == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
|
||||||
|
CHECK(!j.contains(jp));
|
||||||
|
CHECK(!j_const.contains(jp));
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// #5395: a reference token that is numerically representable in
|
||||||
|
// unsigned long long but exceeds size_type's max (e.g. ULLONG_MAX
|
||||||
|
// itself on typical 64-bit platforms, where size_type's max equals
|
||||||
|
// ULLONG_MAX) must not make contains() throw either
|
||||||
|
json::json_pointer const jp("/18446744073709551615");
|
||||||
|
std::string const throw_msg = "[json.exception.out_of_range.410] array index 18446744073709551615 exceeds size_type";
|
||||||
|
|
||||||
|
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j.at(jp) = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
CHECK_THROWS_WITH_AS(j_const.at(jp) == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
|
||||||
|
CHECK(!j.contains(jp));
|
||||||
|
CHECK(!j_const.contains(jp));
|
||||||
}
|
}
|
||||||
|
|
||||||
// on some machines, the check below is not constant
|
// on some machines, the check below is not constant
|
||||||
@@ -334,6 +372,10 @@ TEST_CASE("JSON pointers")
|
|||||||
|
|
||||||
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
|
||||||
|
|
||||||
|
// #5395: contains() must not throw for a reference token exceeding size_type's max
|
||||||
|
CHECK(!j.contains(jp));
|
||||||
|
CHECK(!j_const.contains(jp));
|
||||||
}
|
}
|
||||||
|
|
||||||
DOCTEST_MSVC_SUPPRESS_WARNING_POP
|
DOCTEST_MSVC_SUPPRESS_WARNING_POP
|
||||||
|
|||||||
@@ -14,40 +14,6 @@ using nlohmann::json;
|
|||||||
#include <array>
|
#include <array>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <cstdlib>
|
|
||||||
#include <new>
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
// heap allocation counter used by the regression test for issue #5413
|
|
||||||
// (https://github.com/nlohmann/json/issues/5413); disabled (and thus a
|
|
||||||
// no-op besides the counting) unless explicitly toggled on
|
|
||||||
bool count_heap_allocations = false; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
|
|
||||||
std::size_t heap_allocations = 0; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
void* operator new (std::size_t size) // NOLINT(cppcoreguidelines-owning-memory,misc-new-delete-overloads)
|
|
||||||
{
|
|
||||||
if (count_heap_allocations)
|
|
||||||
{
|
|
||||||
++heap_allocations;
|
|
||||||
}
|
|
||||||
if (void* ptr = std::malloc(size)) // NOLINT(cppcoreguidelines-no-malloc,cppcoreguidelines-owning-memory)
|
|
||||||
{
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
throw std::bad_alloc(); // NOLINT(hicpp-exception-baseclass)
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete (void* ptr) noexcept // NOLINT(cppcoreguidelines-owning-memory,misc-new-delete-overloads)
|
|
||||||
{
|
|
||||||
std::free(ptr); // NOLINT(cppcoreguidelines-no-malloc,cppcoreguidelines-owning-memory)
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete (void* ptr, std::size_t /*size*/) noexcept // NOLINT(cppcoreguidelines-owning-memory,misc-new-delete-overloads)
|
|
||||||
{
|
|
||||||
std::free(ptr); // NOLINT(cppcoreguidelines-no-malloc,cppcoreguidelines-owning-memory)
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("serialization")
|
TEST_CASE("serialization")
|
||||||
{
|
{
|
||||||
@@ -416,76 +382,3 @@ TEST_CASE("dump for basic_json with long double number_float_t")
|
|||||||
check_same(100.0L, 100.0);
|
check_same(100.0L, 100.0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("regression test for issue #5413 - lazily allocated indent_string")
|
|
||||||
{
|
|
||||||
// the serializer used to unconditionally allocate a 512-byte
|
|
||||||
// indent_string in its constructor, even though it is only ever read
|
|
||||||
// inside the pretty_print branches of dump(). This wasted a heap
|
|
||||||
// allocation (and its matching deallocation) on every single compact
|
|
||||||
// (i.e. non-pretty, the default) dump() call. indent_string is now
|
|
||||||
// allocated lazily, the first time a pretty-print branch actually
|
|
||||||
// needs it -- so a compact dump() must perform strictly fewer heap
|
|
||||||
// allocations than a pretty dump() of the same value.
|
|
||||||
const json j = {{"level", "info"}, {"msg", "hello world"}, {"id", 12345}};
|
|
||||||
|
|
||||||
// warm up anything unrelated to indentation (e.g., one-time locale
|
|
||||||
// lookups) that might otherwise allocate on first use regardless of
|
|
||||||
// pretty-printing, so it does not skew the counts measured below
|
|
||||||
const auto warmup = j.dump();
|
|
||||||
const auto warmup_pretty = j.dump(4);
|
|
||||||
CHECK(!warmup.empty());
|
|
||||||
CHECK(!warmup_pretty.empty());
|
|
||||||
|
|
||||||
SECTION("compact dump() has a stable, minimal allocation count")
|
|
||||||
{
|
|
||||||
count_heap_allocations = true;
|
|
||||||
|
|
||||||
heap_allocations = 0;
|
|
||||||
const auto compact1 = j.dump();
|
|
||||||
const auto allocs_compact1 = heap_allocations;
|
|
||||||
|
|
||||||
heap_allocations = 0;
|
|
||||||
const auto compact2 = j.dump(-1);
|
|
||||||
const auto allocs_compact2 = heap_allocations;
|
|
||||||
|
|
||||||
count_heap_allocations = false;
|
|
||||||
|
|
||||||
CHECK(compact1 == compact2);
|
|
||||||
// dump() and dump(-1) both take the compact code path and must
|
|
||||||
// never touch indent_string, so they allocate identically often
|
|
||||||
CHECK(allocs_compact1 == allocs_compact2);
|
|
||||||
}
|
|
||||||
|
|
||||||
SECTION("first pretty dump() allocates more than a compact dump()")
|
|
||||||
{
|
|
||||||
// use a tiny value whose compact ({"a":1}, 7 bytes) and pretty
|
|
||||||
// ({"a": 1} with 1-space indent, 11 bytes) serializations both stay
|
|
||||||
// well inside every common std::string small-string-optimization
|
|
||||||
// buffer (>= 15 bytes on libstdc++/MSVC STL, >= 22 on libc++), so
|
|
||||||
// building the result string itself causes no heap allocation
|
|
||||||
// either way -- isolating indent_string as the only thing that can
|
|
||||||
// possibly account for a difference in allocation count
|
|
||||||
const json tiny = {{"a", 1}};
|
|
||||||
|
|
||||||
count_heap_allocations = true;
|
|
||||||
|
|
||||||
heap_allocations = 0;
|
|
||||||
const auto compact = tiny.dump();
|
|
||||||
const auto allocs_compact = heap_allocations;
|
|
||||||
|
|
||||||
heap_allocations = 0;
|
|
||||||
const auto pretty = tiny.dump(1);
|
|
||||||
const auto allocs_pretty = heap_allocations;
|
|
||||||
|
|
||||||
count_heap_allocations = false;
|
|
||||||
|
|
||||||
CHECK(compact == "{\"a\":1}");
|
|
||||||
CHECK(pretty == "{\n \"a\": 1\n}");
|
|
||||||
// a fresh serializer is created per dump() call; the pretty branch
|
|
||||||
// lazily allocates indent_string on its first use, so it must
|
|
||||||
// allocate at least once more than the compact branch, which never
|
|
||||||
// touches indent_string at all
|
|
||||||
CHECK(allocs_pretty > allocs_compact);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user