Fix uninitialized comparison in buffers iterator

fix #1263

CHANGELOG.md

@@ -2,6 +2,7 @@ Version 187:
 
 * Add experimental timeout_socket
 * Fix warning in file tests
+* Fix uninitialized comparison in buffers iterator
 
 --------------------------------------------------------------------------------
 

doc/qbk/09_releases.qbk

@@ -31,6 +31,8 @@
 
 * ([issue 1267]) Fix parsing of out-of-bounds hex values
 
+* ([issue 1263]) Fix uninitialized comparison in buffers iterator
+
 * Workaround for http-server-fast and libstdc++
 
 [*Experimental]

include/boost/beast/core/buffers_adapter.hpp

@@ -69,6 +69,8 @@ class buffers_adapter
     {
     }
 
+    iter_type end_impl() const;
+
 public:
     /// The type of the underlying mutable buffer sequence
     using value_type = MutableBufferSequence;

include/boost/beast/core/impl/buffers_adapter.ipp

@@ -26,7 +26,7 @@ template<class MutableBufferSequence>
 class buffers_adapter<MutableBufferSequence>::
     const_buffers_type
 {
-    buffers_adapter const* ba_;
+    buffers_adapter const* b_;
 
 public:
     using value_type = boost::asio::const_buffer;
@@ -48,8 +48,8 @@ public:
 private:
     friend class buffers_adapter;
 
-    const_buffers_type(buffers_adapter const& ba)
+    const_buffers_type(buffers_adapter const& b)
-        : ba_(&ba)
+        : b_(&b)
     {
     }
 };
@@ -59,7 +59,7 @@ class buffers_adapter<MutableBufferSequence>::
     const_buffers_type::const_iterator
 {
     iter_type it_;
-    buffers_adapter const* ba_ = nullptr;
+    buffers_adapter const* b_ = nullptr;
 
 public:
     using value_type = boost::asio::const_buffer;
@@ -78,8 +78,20 @@ public:
     bool
     operator==(const_iterator const& other) const
     {
-        return ba_ == other.ba_ &&
+        return
-            it_ == other.it_;
+            (b_ == nullptr) ?
+            (
+                other.b_ == nullptr ||
+                other.it_ == other.b_->end_impl()
+            ):(
+                (other.b_ == nullptr) ?
+                (
+                    it_ == b_->end_impl()
+                ): (
+                    b_ == other.b_ &&
+                    it_ == other.it_
+                )
+            );
     }
 
     bool
@@ -93,9 +105,9 @@ public:
     {
         value_type const b = *it_;
         return value_type{b.data(),
-            (ba_->out_ == boost::asio::buffer_sequence_end(ba_->bs_) ||
+            (b_->out_ == boost::asio::buffer_sequence_end(b_->bs_) ||
-                it_ != ba_->out_) ? b.size() : ba_->out_pos_} +
+                it_ != b_->out_) ? b.size() : b_->out_pos_} +
-                    (it_ == ba_->begin_ ? ba_->in_pos_ : 0);
+                    (it_ == b_->begin_ ? b_->in_pos_ : 0);
     }
 
     pointer
@@ -134,33 +146,30 @@ public:
 private:
     friend class const_buffers_type;
 
-    const_iterator(buffers_adapter const& ba,
+    const_iterator(buffers_adapter const& b,
             iter_type iter)
         : it_(iter)
-        , ba_(&ba)
+        , b_(&b)
     {
     }
 };
 
 template<class MutableBufferSequence>
-inline
 auto
 buffers_adapter<MutableBufferSequence>::
 const_buffers_type::begin() const ->
     const_iterator
 {
-    return const_iterator{*ba_, ba_->begin_};
+    return const_iterator{*b_, b_->begin_};
 }
 
 template<class MutableBufferSequence>
-inline
 auto
 buffers_adapter<MutableBufferSequence>::
 const_buffers_type::end() const ->
     const_iterator
 {
-    return const_iterator{*ba_, ba_->out_ ==
+    return const_iterator{*b_, b_->end_impl()};
-        ba_->end_ ? ba_->end_ : std::next(ba_->out_)};
 }
 
 //------------------------------------------------------------------------------
@@ -169,7 +178,7 @@ template<class MutableBufferSequence>
 class buffers_adapter<MutableBufferSequence>::
 mutable_buffers_type
 {
-    buffers_adapter const* ba_;
+    buffers_adapter const* b_;
 
 public:
     using value_type = boost::asio::mutable_buffer;
@@ -192,8 +201,8 @@ private:
     friend class buffers_adapter;
 
     mutable_buffers_type(
-            buffers_adapter const& ba)
+            buffers_adapter const& b)
-        : ba_(&ba)
+        : b_(&b)
     {
     }
 };
@@ -203,7 +212,7 @@ class buffers_adapter<MutableBufferSequence>::
 mutable_buffers_type::const_iterator
 {
     iter_type it_;
-    buffers_adapter const* ba_ = nullptr;
+    buffers_adapter const* b_ = nullptr;
 
 public:
     using value_type = boost::asio::mutable_buffer;
@@ -222,8 +231,20 @@ public:
     bool
     operator==(const_iterator const& other) const
     {
-        return ba_ == other.ba_ &&
+        return
-            it_ == other.it_;
+            (b_ == nullptr) ?
+            (
+                other.b_ == nullptr ||
+                other.it_ == other.b_->end_
+            ):(
+                (other.b_ == nullptr) ?
+                (
+                    it_ == b_->end_
+                ): (
+                    b_ == other.b_ &&
+                    it_ == other.it_
+                )
+            );
     }
 
     bool
@@ -237,9 +258,9 @@ public:
     {
         value_type const b = *it_;
         return value_type{b.data(),
-            it_ == std::prev(ba_->end_) ?
+            it_ == std::prev(b_->end_) ?
-                ba_->out_end_ : b.size()} +
+                b_->out_end_ : b.size()} +
-                    (it_ == ba_->out_ ? ba_->out_pos_ : 0);
+                    (it_ == b_->out_ ? b_->out_pos_ : 0);
     }
 
     pointer
@@ -278,10 +299,10 @@ public:
 private:
     friend class mutable_buffers_type;
 
-    const_iterator(buffers_adapter const& ba,
+    const_iterator(buffers_adapter const& b,
             iter_type iter)
         : it_(iter)
-        , ba_(&ba)
+        , b_(&b)
     {
     }
 };
@@ -294,7 +315,7 @@ mutable_buffers_type::
 begin() const ->
     const_iterator
 {
-    return const_iterator{*ba_, ba_->out_};
+    return const_iterator{*b_, b_->out_};
 }
 
 template<class MutableBufferSequence>
@@ -305,11 +326,20 @@ mutable_buffers_type::
 end() const ->
     const_iterator
 {
-    return const_iterator{*ba_, ba_->end_};
+    return const_iterator{*b_, b_->end_};
 }
 
 //------------------------------------------------------------------------------
 
+template<class MutableBufferSequence>
+auto
+buffers_adapter<MutableBufferSequence>::
+end_impl() const ->
+    iter_type
+{
+    return out_ == end_ ? end_ : std::next(out_);
+}
+
 template<class MutableBufferSequence>
 buffers_adapter<MutableBufferSequence>::
 buffers_adapter(buffers_adapter&& other)

include/boost/beast/core/impl/buffers_cat.ipp

@@ -281,9 +281,20 @@ buffers_cat_view<Bn...>::
 const_iterator::
 operator==(const_iterator const& other) const
 {
-    if(bn_ != other.bn_)
+    return
-        return false;
+        (bn_ == nullptr) ?
-    return it_ == other.it_;
+        (
+            other.bn_ == nullptr ||
+            other.it_.index() == sizeof...(Bn)
+        ):(
+            (other.bn_ == nullptr) ?
+            (
+                it_.index() == sizeof...(Bn)
+            ): (
+                bn_ == other.bn_ &&
+                it_ == other.it_
+            )
+        );
 }
 
 template<class... Bn>

include/boost/beast/core/impl/buffers_prefix.ipp

@@ -73,7 +73,20 @@ public:
     bool
     operator==(const_iterator const& other) const
     {
-        return b_ == other.b_ && it_ == other.it_;
+        return
+            (b_ == nullptr) ?
+            (
+                other.b_ == nullptr ||
+                other.it_ == other.b_->end_
+            ):(
+                (other.b_ == nullptr) ?
+                (
+                    it_ == b_->end_
+                ): (
+                    b_ == other.b_ &&
+                    it_ == other.it_
+                )
+            );
     }
 
     bool
@@ -139,6 +152,8 @@ private:
     }
 };
 
+//------------------------------------------------------------------------------
+
 template<class BufferSequence>
 void
 buffers_prefix_view<BufferSequence>::

include/boost/beast/core/impl/buffers_suffix.ipp

@@ -54,7 +54,20 @@ public:
     bool
     operator==(const_iterator const& other) const
     {
-        return b_ == other.b_ && it_ == other.it_;
+        return
+            (b_ == nullptr) ?
+            (
+                other.b_ == nullptr ||
+                other.it_ == boost::asio::buffer_sequence_end(other.b_->bs_)
+            ):(
+                (other.b_ == nullptr) ?
+                (
+                    it_ == boost::asio::buffer_sequence_end(b_->bs_)
+                ): (
+                    b_ == other.b_ &&
+                    it_ == other.it_
+                )
+            );
     }
 
     bool