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

Use value_in_range_of trait

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-06-08 09:20:18 +02:00
parent b0e8030e6e
commit 0e1e471a52
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/detail/input/binary_reader.hpp
View File

@ -2079,7 +2079,7 @@ class binary_reader
return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr)); exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
} }
if (number > std::numeric_limits<std::size_t>::max()) if (!value_in_range_of<std::size_t>(number))
{ {
return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read,
exception_message(input_format, "integer value overflow", "size"), nullptr)); exception_message(input_format, "integer value overflow", "size"), nullptr));
@ -2129,7 +2129,7 @@ class binary_reader
{ {
return false; return false;
} }
if (number > std::numeric_limits<std::size_t>::max()) if (!value_in_range_of<std::size_t>(number))
{ {
return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read,
exception_message(input_format, "integer value overflow", "size"), nullptr)); exception_message(input_format, "integer value overflow", "size"), nullptr));

4
single_include/nlohmann/json.hpp
View File

@ -10764,7 +10764,7 @@ class binary_reader
return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr)); exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
} }
if (number > std::numeric_limits<std::size_t>::max()) if (!value_in_range_of<std::size_t>(number))
{ {
return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read,
exception_message(input_format, "integer value overflow", "size"), nullptr)); exception_message(input_format, "integer value overflow", "size"), nullptr));
@ -10814,7 +10814,7 @@ class binary_reader
{ {
return false; return false;
} }
if (number > std::numeric_limits<std::size_t>::max()) if (!value_in_range_of<std::size_t>(number))
{ {
return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read, return sax->parse_error(chars_read, get_token_string(), parse_error::create(408, chars_read,
exception_message(input_format, "integer value overflow", "size"), nullptr)); exception_message(input_format, "integer value overflow", "size"), nullptr));