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

Merge pull request #14 from elliotgoodrich/master

Browse source 
Fix double delete on std::bad_alloc exception
This commit is contained in:
Niels 2015-01-06 18:43:21 +01:00
commit 5f05d02c6a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.cc
View file

@ -1175,6 +1175,7 @@ json::iterator json::find(const char* key)
{ {
json::iterator result(this); json::iterator result(this);
delete result.oi_; delete result.oi_;
result.oi_ = nullptr;
result.oi_ = new object_t::iterator(i); result.oi_ = new object_t::iterator(i);
return result; return result;
} }
@ -1198,6 +1199,7 @@ json::const_iterator json::find(const char* key) const
{ {
json::const_iterator result(this); json::const_iterator result(this);
delete result.oi_; delete result.oi_;
result.oi_ = nullptr;
result.oi_ = new object_t::const_iterator(i); result.oi_ = new object_t::const_iterator(i);
return result; return result;
} }