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

Merge pull request #1001 from nlohmann/leak

Browse source 
Fix memory leak during parser callback
This commit is contained in:
Niels Lohmann 2018-03-09 21:23:00 +01:00 committed by GitHub
commit e737de8941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/detail/input/lexer.hpp
View file

@ -1130,7 +1130,7 @@ scan_number_done:
} }
/// return current string value (implicitly resets the token; useful only once) /// return current string value (implicitly resets the token; useful only once)
std::string move_string() std::string&& move_string()
{ {
return std::move(token_buffer); return std::move(token_buffer);
} }

1
include/nlohmann/detail/input/parser.hpp
View file

@ -403,6 +403,7 @@ class parser
if (keep and callback and not callback(depth, parse_event_t::value, result)) if (keep and callback and not callback(depth, parse_event_t::value, result))
{ {
result.m_value.destroy(result.m_type);
result.m_type = value_t::discarded; result.m_type = value_t::discarded;
} }
} }

6
include/nlohmann/json.hpp
View file

@ -953,7 +953,7 @@ class basic_json
/// constructor for rvalue strings /// constructor for rvalue strings
json_value(string_t&& value) json_value(string_t&& value)
{ {
string = create<string_t>(std::move(value)); string = create<string_t>(std::forward < string_t&& > (value));
} }
/// constructor for objects /// constructor for objects
@ -965,7 +965,7 @@ class basic_json
/// constructor for rvalue objects /// constructor for rvalue objects
json_value(object_t&& value) json_value(object_t&& value)
{ {
object = create<object_t>(std::move(value)); object = create<object_t>(std::forward < object_t&& > (value));
} }
/// constructor for arrays /// constructor for arrays
@ -977,7 +977,7 @@ class basic_json
/// constructor for rvalue arrays /// constructor for rvalue arrays
json_value(array_t&& value) json_value(array_t&& value)
{ {
array = create<array_t>(std::move(value)); array = create<array_t>(std::forward < array_t&& > (value));
} }
void destroy(value_t t) noexcept void destroy(value_t t) noexcept

9
single_include/nlohmann/json.hpp
View file

@ -2969,7 +2969,7 @@ scan_number_done:
} }
/// return current string value (implicitly resets the token; useful only once) /// return current string value (implicitly resets the token; useful only once)
std::string move_string() std::string&& move_string()
{ {
return std::move(token_buffer); return std::move(token_buffer);
} }
@ -3526,6 +3526,7 @@ class parser
if (keep and callback and not callback(depth, parse_event_t::value, result)) if (keep and callback and not callback(depth, parse_event_t::value, result))
{ {
result.m_value.destroy(result.m_type);
result.m_type = value_t::discarded; result.m_type = value_t::discarded;
} }
} }
@ -10561,7 +10562,7 @@ class basic_json
/// constructor for rvalue strings /// constructor for rvalue strings
json_value(string_t&& value) json_value(string_t&& value)
{ {
string = create<string_t>(std::move(value)); string = create<string_t>(std::forward < string_t&& > (value));
} }
/// constructor for objects /// constructor for objects
@ -10573,7 +10574,7 @@ class basic_json
/// constructor for rvalue objects /// constructor for rvalue objects
json_value(object_t&& value) json_value(object_t&& value)
{ {
object = create<object_t>(std::move(value)); object = create<object_t>(std::forward < object_t&& > (value));
} }
/// constructor for arrays /// constructor for arrays
@ -10585,7 +10586,7 @@ class basic_json
/// constructor for rvalue arrays /// constructor for rvalue arrays
json_value(array_t&& value) json_value(array_t&& value)
{ {
array = create<array_t>(std::move(value)); array = create<array_t>(std::forward < array_t&& > (value));
} }
void destroy(value_t t) noexcept void destroy(value_t t) noexcept