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

Fix double delete on std::bad_alloc exception

Browse Source 
If the new operator throws in the json::find methods then result.oi_ is
deleted again in the destructor of json::iterator/json::const_iterator,
which is a double delete and undefined behaviour.
This commit is contained in:
Elliot Goodrich 2015-01-06 09:12:55 +00:00
parent 4f0afbbe64
commit 0773f40a8e
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

@ -1192,6 +1192,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;
} }
@ -1215,6 +1216,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;
} }