Don't use uninitialized iterator on the rhs of assignment2.2.0

1 files changed, 11 insertions, 0 deletions

diff --git a/common/session/custom/session.hxx b/common/session/custom/session.hxx
index cda0258..6de140e 100644
--- a/common/session/custom/session.hxx
+++ b/common/session/custom/session.hxx
@@ -104,6 +104,17 @@ public:
     cache_position (): map_ (0) {}
     cache_position (map& m, const iterator& p): map_ (&m), pos_ (p) {}
 
+    cache_position&
+    operator= (const cache_position& p)
+    {
+      // It might not be ok to use an uninitialized iterator on the rhs.
+      //
+      if (p.map_ != 0)
+        pos_ = p.pos_;
+      map_ = p.map_;
+      return *this;
+    }
+
     map* map_;
     iterator pos_;
   };