amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-11 17:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid useless casts of header fields in the image tests

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-11 11:31:36 +02:00
1 parent a022f2a5e4
commit f0eee7f0dd
1 file changed
+13 -6
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/unit-json_view_image.cpp
+13 -6
View File
@@ -80,6 +80,14 @@ std::uint64_t header_field(const std::vector<std::uint8_t>& image, std::size_t o
return v; return v;
} }
// a header field as a size; the cast is from a variable, which GCC's
// -Wuseless-cast does not flag where std::uint64_t and std::size_t coincide
std::size_t header_size_field(const std::vector<std::uint8_t>& image, std::size_t offset)
{
const std::uint64_t v = header_field(image, offset);
return static_cast<std::size_t>(v);
}
void set_header_field(std::vector<std::uint8_t>& image, std::size_t offset, std::uint64_t v) void set_header_field(std::vector<std::uint8_t>& image, std::size_t offset, std::uint64_t v)
{ {
std::memcpy(image.data() + offset, &v, sizeof(v)); std::memcpy(image.data() + offset, &v, sizeof(v));
@@ -87,8 +95,7 @@ void set_header_field(std::vector<std::uint8_t>& image, std::size_t offset, std:
std::size_t node_count(const std::vector<std::uint8_t>& image) std::size_t node_count(const std::vector<std::uint8_t>& image)
{ {
const std::uint64_t count = header_field(image, 8); return header_size_field(image, 8);
return static_cast<std::size_t>(count);
} }
std::size_t text_at(const std::vector<std::uint8_t>& image) std::size_t text_at(const std::vector<std::uint8_t>& image)
@@ -739,7 +746,7 @@ TEST_CASE("json_view images: errors")
// the NULs after the text and the decoded strings // the NULs after the text and the decoded strings
bad = image; bad = image;
bad[text_at(image) + static_cast<std::size_t>(header_field(image, 16))] = 'x'; bad[text_at(image) + header_size_field(image, 16)] = 'x';
CHECK(load_result(bad, image_check::none) == prefix + "sizes out of range"); CHECK(load_result(bad, image_check::none) == prefix + "sizes out of range");
bad = image; bad = image;
bad.back() = 'x'; bad.back() = 'x';
@@ -844,8 +851,8 @@ TEST_CASE("json_view images: check")
SECTION("bounds") SECTION("bounds")
{ {
const std::size_t text_size = static_cast<std::size_t>(header_field(image, 16)); const std::size_t text_size = header_size_field(image, 16);
const std::size_t arena_size = static_cast<std::size_t>(header_field(image, 24)); const std::size_t arena_size = header_size_field(image, 24);
rejected(corrupted(image, 1, [&](node & n) rejected(corrupted(image, 1, [&](node & n)
{ {
n.off = static_cast<std::uint32_t>(text_size + 1); n.off = static_cast<std::uint32_t>(text_size + 1);
@@ -952,7 +959,7 @@ TEST_CASE("json_view images: check")
// invalid UTF-8 in a decoded string // invalid UTF-8 in a decoded string
b = image; b = image;
const node s2 = node_at(image, 2); const node s2 = node_at(image, 2);
b[t + static_cast<std::size_t>(header_field(image, 16)) + 1 + s2.off] = 0xFF; b[t + header_size_field(image, 16) + 1 + s2.off] = 0xFF;
rejected(b, false); rejected(b, false);
} }