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

Merge pull request #2879 from nlohmann/issue2598

Browse Source 
Avoid string in case of empty CBOR objects
This commit is contained in:
Niels Lohmann 2021-07-17 12:38:33 +02:00 committed by GitHub
commit 8f0a880c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,6 +1082,8 @@ class binary_reader
return false; return false;
} }
if (len != 0)
{
string_t key; string_t key;
if (len != std::size_t(-1)) if (len != std::size_t(-1))
{ {
@ -1116,6 +1118,7 @@ class binary_reader
key.clear(); key.clear();
} }
} }
}
return sax->end_object(); return sax->end_object();
} }

3
single_include/nlohmann/json.hpp
View File

@ -9298,6 +9298,8 @@ class binary_reader
return false; return false;
} }
if (len != 0)
{
string_t key; string_t key;
if (len != std::size_t(-1)) if (len != std::size_t(-1))
{ {
@ -9332,6 +9334,7 @@ class binary_reader
key.clear(); key.clear();
} }
} }
}
return sax->end_object(); return sax->end_object();
} }