amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-18 03:58:12 +00:00
Code Issues Packages Projects 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 committed 2015-01-06 18:43:21 +01:00
2 parents a53c878c81 0773f40a8e
commit 5f05d02c6a
1 file changed
+2
Download Patch File Download Diff File Expand all files Collapse all files
src/json.cc
+2
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;
} }