Compare commits

...

3 Commits

Author SHA1 Message Date
Niels Lohmann 3249b180cc 🚨 fix compilation
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-05-21 08:31:03 +02:00
Niels Lohmann 61f0d683e0 🐛 avoid overflow
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-05-20 22:08:45 +02:00
Niels Lohmann b3effb609c 🐛 use correct indentation character on resize
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-05-20 21:56:32 +02:00
3 changed files with 47 additions and 6 deletions
@@ -128,7 +128,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements
@@ -201,7 +202,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements
@@ -262,7 +264,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
o->write_characters(indent_string.c_str(), new_indent);
+6 -3
View File
@@ -19302,7 +19302,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements
@@ -19375,7 +19376,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements
@@ -19436,7 +19438,8 @@ class serializer
const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
o->write_characters(indent_string.c_str(), new_indent);
+35
View File
@@ -245,6 +245,41 @@ TEST_CASE("object inspection")
CHECK(binary.dump(1024).size() == 2086);
}
SECTION("indentation and resize")
{
SECTION("array")
{
const auto j_array = json::parse("[[[[[[]]]]]]");
// check right size after indentation triggering a resize
CHECK(j_array.dump(1024).size() == 25622);
// check if right indentation symbol is used
CHECK(j_array.dump(1024, '\t')[4096] == '\t');
// check resize is large enough
CHECK(j_array.dump(10000).size() == 250022);
}
SECTION("object")
{
const auto j_object = json::parse(R"({"":{"":{"":{"":{"":{}}}}}})");
// check right size after indentation triggering a resize
CHECK(j_object.dump(1024).size() == 25642);
// check if right indentation symbol is used
CHECK(j_object.dump(1024, '\t')[4096] == '\t');
// check resize is large enough
CHECK(j_object.dump(10000).size() == 250042);
}
SECTION("binary")
{
const auto j_binary = json::binary({1, 2, 3}, 128);
// check right size after indentation triggering a resize
CHECK(j_binary.dump(1024).size() == 2086);
CHECK(j_binary.dump(1024, '\t')[1024] == '\t');
// check resize is large enough
CHECK(j_binary.dump(10000).size() == 20038);
}
}
SECTION("dump and floating-point numbers")
{
auto s = json(42.23).dump();