boostorg/move
1
0
Fork 1
mirror of https://github.com/boostorg/move.git synced 2025-07-31 21:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential self-move points

Browse Source
This commit is contained in:
Ion Gaztañaga
2022-08-21 02:19:44 +02:00
parent 19bb08cf17
commit 3a4cf45106
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/move/algo/detail/adaptive_sort_merge.hpp
View File

@@ -175,7 +175,8 @@ void swap_and_update_key
{ {
if(begin != with){ if(begin != with){
::boost::adl_move_swap_ranges(begin, end, with); ::boost::adl_move_swap_ranges(begin, end, with);
::boost::adl_move_swap(*key_next, *key_range2); if(key_next != key_range2) //Avoid potential self-swapping
::boost::adl_move_swap(*key_next, *key_range2);
if(key_next == key_mid){ if(key_next == key_mid){
key_mid = key_range2; key_mid = key_range2;
} }
@@ -217,7 +218,8 @@ RandIt2 buffer_and_update_key
while(begin != end) { while(begin != end) {
op(three_way_t(), begin++, with++, buffer++); op(three_way_t(), begin++, with++, buffer++);
} }
::boost::adl_move_swap(*key_next, *key_range2); if (key_next != key_range2) //Avoid potential self-swapping
::boost::adl_move_swap(*key_next, *key_range2);
if (key_next == key_mid) { if (key_next == key_mid) {
key_mid = key_range2; key_mid = key_range2;
} }

3
include/boost/move/algo/detail/pdqsort.hpp
View File

@@ -192,7 +192,8 @@ namespace pdqsort_detail {
// Put the pivot in the right place. // Put the pivot in the right place.
Iter pivot_pos = first - 1; Iter pivot_pos = first - 1;
*begin = boost::move(*pivot_pos); if(begin != pivot_pos) //Avoid potential self-move
*begin = boost::move(*pivot_pos);
*pivot_pos = boost::move(pivot); *pivot_pos = boost::move(pivot);
return pdqsort_detail::pair<Iter, bool>(pivot_pos, already_partitioned); return pdqsort_detail::pair<Iter, bool>(pivot_pos, already_partitioned);