Fix bug in clone_subtree when updating leftmost and rightmost nodes

Author: igaztanaga

include/boost/intrusive/bstree_algorithms.hpp

@@ -1973,8 +1973,8 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
                //Insert left
                NodeTraits::set_parent(insertion_point, temp);
                NodeTraits::set_left  (temp, insertion_point);
-               //Update leftmost
-               if(rightmost == target_sub_root)
+               //Update leftmost only if the parent was the current leftmost
+               if(leftmost == temp)
                   leftmost = insertion_point;
             }
             //Then clone right nodes
@@ -1989,8 +1989,9 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
                //Insert right
                NodeTraits::set_parent(insertion_point, temp);
                NodeTraits::set_right (temp, insertion_point);
-               //Update rightmost
-               rightmost = insertion_point;
+               //Update rightmost only if the parent was the current rightmost
+               if(rightmost == temp)
+                  rightmost = insertion_point;
             }
             //If not, go up
             else if(current == source_root){

test/generic_assoc_test.hpp

@@ -12,6 +12,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 #include <boost/container/vector.hpp> //vector
+#include <algorithm> //std::next_permutation
 #include <boost/intrusive/detail/config_begin.hpp>
 #include "common_functors.hpp"
 #include <boost/intrusive/options.hpp>
@@ -428,6 +429,36 @@ void test_generic_assoc<ContainerDefiner>::test_clone(value_cont_type& values)
       testset2.clear_and_dispose(test::delete_noexcept_disposer<value_type>());
       BOOST_TEST (testset2.empty());
    }
+   {  //In non-balanced trees the shape
+      //depends on the insertion order, so test all insertion orders
+      typedef typename ContainerDefiner::template container
+         <>::type assoc_type;
+      typedef typename assoc_type::value_type value_type;
+
+      const std::size_t NumValues = 5;
+      value_cont_type vals(NumValues);
+      std::size_t order[NumValues];
+      for(std::size_t i = 0; i != NumValues; ++i){
+         (&vals[i])->value_ = (int)i;
+         order[i] = i;
+      }
+
+      do{
+         assoc_type testset1;
+         for(std::size_t i = 0; i != NumValues; ++i){
+            testset1.insert(vals[order[i]]);
+         }
+         assoc_type testset2;
+         testset2.clone_from(testset1, test::new_cloner<value_type>(), test::delete_disposer<value_type>());
+         BOOST_TEST (testset2 == testset1);
+         BOOST_TEST (testset2.size() == NumValues);
+         BOOST_TEST (*testset2.begin()  == *testset1.begin());
+         BOOST_TEST (*testset2.rbegin() == *testset1.rbegin());
+         testset2.check();
+         testset2.clear_and_dispose(test::delete_noexcept_disposer<value_type>());
+         testset1.clear();
+      }while(std::next_permutation(order, order + NumValues));
+   }
 }
 
 template<class ContainerDefiner>