j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message

Browse source
This commit is contained in:
Julian Becker 2018-10-18 20:05:46 +02:00
parent 5ba812d518
commit ad11b6c35e
4 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/nlohmann/detail/output/binary_writer.hpp
View file

@ -683,9 +683,11 @@ class binary_writer
*/
static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name)
{
if (name.find(static_cast<typename BasicJsonType::string_t::value_type>(0)) != BasicJsonType::string_t::npos)
const auto it = name.find(static_cast<typename BasicJsonType::string_t::value_type>(0));
if (it != BasicJsonType::string_t::npos)
{
JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000"));
JSON_THROW(out_of_range::create(409,
"BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
}
return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;