boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 11:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

made sure source values are destroyed on copy-based rehash

Browse Source
This commit is contained in:
joaquintides
2022-10-19 17:42:59 +02:00
parent 3d07c33efe
commit f3353c9be3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/unordered/detail/foa.hpp
View File

@ -1677,6 +1677,14 @@ private:
BOOST_RETHROW BOOST_RETHROW
} }
BOOST_CATCH_END BOOST_CATCH_END
/* either all moved and destroyed or all copied */
BOOST_ASSERT(num_destroyed=size()||num_destroyed==0);
if(num_destroyed!=size()){
for_all_elements([this](value_type* p){
destroy_element(p);
});
}
delete_arrays(arrays); delete_arrays(arrays);
arrays=new_arrays_; arrays=new_arrays_;
ml=max_load(); ml=max_load();
@ -1720,7 +1728,7 @@ private:
void nosize_transfer_element( void nosize_transfer_element(
value_type* p,std::size_t hash,const arrays_type& arrays_, value_type* p,std::size_t hash,const arrays_type& arrays_,
std::size_t& num_destroyed,std::true_type /* move */) std::size_t& num_destroyed,std::true_type /* ->move */)
{ {
/* Destroy p even if an an exception is thrown in the middle of move /* Destroy p even if an an exception is thrown in the middle of move
* construction, which could leave the source half-moved. * construction, which could leave the source half-moved.
@ -1734,7 +1742,7 @@ private:
void nosize_transfer_element( void nosize_transfer_element(
value_type* p,std::size_t hash,const arrays_type& arrays_, value_type* p,std::size_t hash,const arrays_type& arrays_,
std::size_t& /*num_destroyed*/,std::false_type /* copy */) std::size_t& /*num_destroyed*/,std::false_type /* ->copy */)
{ {
nosize_unchecked_emplace_at( nosize_unchecked_emplace_at(
arrays_,position_for(hash,arrays_),hash, arrays_,position_for(hash,arrays_),hash,