lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-12 09:21:42 +03:00
Code Activity

🚑 fix for #408

Browse Source
This commit is contained in:
Niels Lohmann
2016-12-29 17:00:02 +01:00
parent 383a29a924
commit f0edab2363
3 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/json.hpp.re2c
View File

@ -6879,27 +6879,6 @@ class basic_json
}
}
/*!
@brief checks if a given length does not exceed the size of a given vector
To secure the access to the byte vector during CBOR/MessagePack
deserialization, bytes are copied from the vector into buffers. This
function checks if the number of bytes to copy (@a len) does not exceed the
size of the given vector @a vec.
@param[in] vec byte vector
@param[in] len length
@throws out_of_range if `len > v.size()`
*/
static void check_length(const std::vector<uint8_t>& vec, const size_t& len)
{
if (len > vec.size())
{
throw std::out_of_range("len out of range");
}
}
/*!
@brief create a JSON value from a given MessagePack vector
@ -6916,6 +6895,9 @@ class basic_json
*/
static basic_json from_msgpack_internal(const std::vector<uint8_t>& v, size_t& idx)
{
// make sure reading 1 byte is safe
check_length(v.size(), 1, idx);
// store and increment index
const size_t current_idx = idx++;
@ -7153,6 +7135,9 @@ class basic_json
*/
static basic_json from_cbor_internal(const std::vector<uint8_t>& v, size_t& idx)
{
// make sure reading 1 byte is safe
check_length(v.size(), 1, idx);
// store and increment index
const size_t current_idx = idx++;
@ -7674,11 +7659,6 @@ class basic_json
*/
static basic_json from_msgpack(const std::vector<uint8_t>& v)
{
if (v.empty())
{
throw std::invalid_argument("empty vector");
}
size_t i = 0;
return from_msgpack_internal(v, i);
}
@ -7736,11 +7716,6 @@ class basic_json
*/
static basic_json from_cbor(const std::vector<uint8_t>& v)
{
if (v.empty())
{
throw std::invalid_argument("empty vector");
}
size_t i = 0;
return from_cbor_internal(v, i);
}