mirror of
https://github.com/nlohmann/json.git
synced 2026-11-02 19:05:35 +00:00
UBJSON/BJData reader: reject a container count equal to SIZE_MAX
The reader marks a container whose count is not known by npos, which
is SIZE_MAX. A count of exactly that value was stored unchanged and
then read as "no count", so the BJData input
[ # M ff ff ff ff ff ff ff ff i 01 ]
parsed as [1] instead of throwing out_of_range.408 as a count of
2^64-2 does. Where size_t is 32 bits, the same holds for 'm' and 'L'
counts of 2^32-1, in UBJSON too.
The counts of 'm', 'M' and the signed types now go through
store_ubjson_count(), which rejects npos with "integer value overflow"
(the message a count beyond size_t already gets), as the CBOR reader
does in get_cbor_container_size(). An ND-array dimension of 2^64-1 gets
the same message now, where it was "excessive ndarray size caused
overflow" (the product check) on 64-bit platforms.
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
4 files changed
+84
-16
No files matched your search
@@ -3123,6 +3123,27 @@ class binary_reader
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief store the count of an optimized container (or the length of a string)
|
||||
|
||||
A count equal to npos is rejected: npos marks a container whose count is
|
||||
not known, so a count of that value would be read as "no count" (compare
|
||||
get_cbor_container_size()). No container can hold that many elements.
|
||||
|
||||
@param[in] count the count read from the input
|
||||
@param[out] result set to @a count unless it is rejected
|
||||
@return whether @a count is usable
|
||||
*/
|
||||
bool store_ubjson_count(const std::size_t count, std::size_t& result)
|
||||
{
|
||||
if (JSON_HEDLEY_UNLIKELY(count == npos))
|
||||
{
|
||||
return out_of_range_error(exception_id::container_too_large, "integer value overflow", "size");
|
||||
}
|
||||
result = count;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief read a UBJSON/BJData optimized-container count of a signed marker
|
||||
type ('i', 'I', 'l', 'L') and narrow it to std::size_t
|
||||
@@ -3153,8 +3174,7 @@ class binary_reader
|
||||
{
|
||||
return out_of_range_error(exception_id::container_too_large, "integer value overflow", "size");
|
||||
}
|
||||
result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
|
||||
return true;
|
||||
return store_ubjson_count(static_cast<std::size_t>(number), result); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -3231,8 +3251,7 @@ class binary_reader
|
||||
{
|
||||
return false;
|
||||
}
|
||||
result = conditional_static_cast<std::size_t>(number);
|
||||
return true;
|
||||
return store_ubjson_count(conditional_static_cast<std::size_t>(number), result);
|
||||
}
|
||||
|
||||
case 'M':
|
||||
@@ -3250,8 +3269,7 @@ class binary_reader
|
||||
{
|
||||
return out_of_range_error(exception_id::container_too_large, "integer value overflow", "size");
|
||||
}
|
||||
result = detail::conditional_static_cast<std::size_t>(number);
|
||||
return true;
|
||||
return store_ubjson_count(detail::conditional_static_cast<std::size_t>(number), result);
|
||||
}
|
||||
|
||||
case '[':
|
||||
|
||||
Reference in new issue
Block a user