Commit 0773f40a authored by Elliot Goodrich's avatar Elliot Goodrich

Fix double delete on std::bad_alloc exception

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.
parent 4f0afbbe
......@@ -1192,6 +1192,7 @@ json::iterator json::find(const char* key)
{
json::iterator result(this);
delete result.oi_;
result.oi_ = nullptr;
result.oi_ = new object_t::iterator(i);
return result;
}
......@@ -1215,6 +1216,7 @@ json::const_iterator json::find(const char* key) const
{
json::const_iterator result(this);
delete result.oi_;
result.oi_ = nullptr;
result.oi_ = new object_t::const_iterator(i);
return result;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment