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

+ fix memory issues

Browse source
This commit is contained in:
Niels 2014-12-29 12:51:20 +01:00
parent 2c1b3e5108
commit 725202356b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -32,3 +32,5 @@ missing
test-driver test-driver
Makefile.in Makefile.in
*.plist

6
src/JSON.cc
View file

@ -162,7 +162,7 @@ JSON::JSON(list_init_t a) noexcept
// the initializer list describes an array // the initializer list describes an array
_type = value_type::array; _type = value_type::array;
_value = new array_t(std::move(a)); _value = new array_t(a);
return; return;
} }
} }
@ -684,6 +684,8 @@ void JSON::push_back(JSON&& o)
// add element to array (move semantics) // add element to array (move semantics)
_value.array->emplace_back(std::move(o)); _value.array->emplace_back(std::move(o));
// invalidate object
o._type = value_type::null;
} }
void JSON::push_back(const std::string& s) void JSON::push_back(const std::string& s)
@ -1188,6 +1190,7 @@ JSON::iterator JSON::find(const char* key)
if (i != _value.object->end()) if (i != _value.object->end())
{ {
JSON::iterator result(this); JSON::iterator result(this);
delete result._oi;
result._oi = new object_t::iterator(i); result._oi = new object_t::iterator(i);
return result; return result;
} }
@ -1210,6 +1213,7 @@ JSON::const_iterator JSON::find(const char* key) const
if (i != _value.object->end()) if (i != _value.object->end())
{ {
JSON::const_iterator result(this); JSON::const_iterator result(this);
delete result._oi;
result._oi = new object_t::const_iterator(i); result._oi = new object_t::const_iterator(i);
return result; return result;
} }