feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Fix exception handling in rehash_impl

Browse Source 
And improve tests so they will catch the error, and other similar errors.
This commit is contained in:
Daniel James
2017-05-04 19:30:18 +01:00
parent d49d0e90a8
commit 47a8c3fc67
10 changed files with 268 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/unordered/detail/implementation.hpp
View File

@@ -1516,7 +1516,7 @@ construct_from_args(Alloc& alloc, std::pair<A, B>* address, BOOST_FWD_REF(A0),
{
boost::unordered::detail::func::destroy(
boost::addressof(address->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
}
@@ -1551,7 +1551,7 @@ inline typename enable_if<use_piecewise<A0>, void>::type construct_from_args(
{
boost::unordered::detail::func::destroy(
boost::addressof(address->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
}
@@ -1630,7 +1630,7 @@ inline void construct_from_args(Alloc& alloc, std::pair<A, B>* address,
{
boost::unordered::detail::func::destroy(
boost::addressof(address->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
}
@@ -1841,7 +1841,7 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k)
{
boost::unordered::detail::func::destroy(
boost::addressof(a.node_->value_ptr()->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
return a.release();
@@ -1865,7 +1865,7 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k, BOOST_FWD_REF(Mapped) m)
{
boost::unordered::detail::func::destroy(
boost::addressof(a.node_->value_ptr()->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
return a.release();
@@ -1890,7 +1890,7 @@ construct_node_pair_from_args(
{
boost::unordered::detail::func::destroy(
boost::addressof(a.node_->value_ptr()->first));
BOOST_RETHROW;
BOOST_RETHROW
}
BOOST_CATCH_END
return a.release();
@@ -4274,7 +4274,10 @@ inline void table<Types>::rehash_impl(std::size_t num_buckets)
}
}
}
BOOST_CATCH(...) { delete_nodes(prev, node_pointer()); }
BOOST_CATCH(...) {
delete_nodes(prev, node_pointer());
BOOST_RETHROW
}
BOOST_CATCH_END
}