Merge pull request #94 from mjendruk/fix-any-range-non-reference-references

Fix any_range with non-reference references can cause UB

include/boost/range/detail/any_iterator_interface.hpp

@@ -12,8 +12,7 @@
 
 #include <boost/range/detail/any_iterator_buffer.hpp>
 #include <boost/iterator/iterator_categories.hpp>
-#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -35,15 +34,16 @@ namespace boost
         };
 
         template<class T>
-        struct mutable_reference_type_generator
+        struct reference_as_value_type_generator
         {
+            typedef typename remove_reference<
+                typename remove_const<T>::type
+            >::type value_type;
+
             typedef typename mpl::if_<
-                typename mpl::and_<
+                typename is_convertible<const value_type&, value_type>::type,
-                    typename is_const<T>::type,
+                value_type,
-                    typename mpl::not_<typename is_reference<T>::type>::type
+                T
-                >::type,
-                T,
-                typename add_reference<T>::type
             >::type type;
         };
 
@@ -53,16 +53,12 @@ namespace boost
         >
         struct any_incrementable_iterator_interface
         {
-            typedef typename mutable_reference_type_generator<
+            typedef Reference reference;
-                Reference
-            >::type reference;
-
             typedef typename const_reference_type_generator<
                 Reference
             >::type const_reference;
-
+            typedef typename reference_as_value_type_generator<
-            typedef typename remove_const<
+                Reference
-                typename remove_reference<Reference>::type
             >::type reference_as_value_type;
 
             typedef Buffer buffer_type;

test/Jamfile.v2

@@ -81,6 +81,7 @@ test-suite range :
     [ range-test adaptor_test/type_erased_forward ]
     [ range-test adaptor_test/type_erased_bidirectional ]
     [ range-test adaptor_test/type_erased_random_access ]
+    [ range-test adaptor_test/type_erased_transformed ]
     [ range-test adaptor_test/uniqued ]
     [ range-test adaptor_test/adjacent_filtered_example ]
     [ range-test adaptor_test/copied_example ]

test/adaptor_test/type_erased_transformed.cpp

@@ -0,0 +1,67 @@
+// Boost.Range library
+//
+//  Copyright Neil Groves 2014. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//
+#include <boost/range/adaptor/type_erased.hpp>
+#include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/numeric.hpp>
+#include "type_erased_test.hpp"
+
+#include <boost/test/unit_test.hpp>
+
+#include <vector>
+
+namespace boost_range_adaptor_type_erased_test
+{
+    namespace
+    {
+
+typedef boost::any_range<
+    int,
+    boost::random_access_traversal_tag,
+    int,
+    std::ptrdiff_t
+> any_integer_value_range;
+
+struct get_fn
+{
+    typedef boost::int32_t result_type;
+    boost::int32_t operator()(const MockType& val) const
+    {
+        return val.get();
+    }
+};
+
+int accumulate_any_integer_value_range(any_integer_value_range rng)
+{
+    return boost::accumulate(rng, 0);
+}
+
+void test_type_erased_transformed()
+{
+    std::vector<MockType> v(5, MockType(3));
+
+    const int sum = accumulate_any_integer_value_range(
+        v | boost::adaptors::transformed(get_fn()));
+
+    BOOST_CHECK_EQUAL(15, sum);
+}
+
+    } // anonymous namespace
+} // namespace boost_range_adaptor_type_erased_test
+
+boost::unit_test::test_suite*
+init_unit_test_suite(int, char*[])
+{
+    boost::unit_test::test_suite* test
+        = BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_transformed");
+
+    test->add(
+        BOOST_TEST_CASE(
+            &boost_range_adaptor_type_erased_test::test_type_erased_transformed));
+
+    return test;
+}