SERVER-51180 Fix uninitialized variables in CollectionCatalog::iterator when using constructor for end iterator.

They were basically harmless but would cause problem if iterators are compared other way around. This will make the comparison operator symmetric.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/mongo/db/catalog/collection_catalog.cpp b/src/mongo/db/catalog/collection_catalog.cpp
index cbfca442750..4db4b069794 100644
--- a/src/mongo/db/catalog/collection_catalog.cpp
+++ b/src/mongo/db/catalog/collection_catalog.cpp
@@ -209,8 +209,10 @@ CollectionCatalog::iterator::iterator(OperationContext* opCtx,
 
 CollectionCatalog::iterator::iterator(OperationContext* opCtx,
                                       std::map<std::pair<std::string, CollectionUUID>,
-                                               std::shared_ptr<Collection>>::const_iterator mapIter)
-    : _opCtx(opCtx), _mapIter(mapIter) {}
+                                               std::shared_ptr<Collection>>::const_iterator mapIter,
+                                      uint64_t genNum,
+                                      const CollectionCatalog& catalog)
+    : _opCtx(opCtx), _genNum(genNum), _mapIter(mapIter), _catalog(&catalog) {}
 
 CollectionCatalog::iterator::value_type CollectionCatalog::iterator::operator*() {
     stdx::lock_guard<Latch> lock(_catalog->_catalogLock);
@@ -846,7 +848,7 @@ CollectionCatalog::iterator CollectionCatalog::begin(OperationContext* opCtx, St
 }
 
 CollectionCatalog::iterator CollectionCatalog::end(OperationContext* opCtx) const {
-    return iterator(opCtx, _orderedCollections.end());
+    return iterator(opCtx, _orderedCollections.end(), _generationNumber, *this);
 }
 
 boost::optional<std::string> CollectionCatalog::lookupResourceName(const ResourceId& rid) {
diff --git a/src/mongo/db/catalog/collection_catalog.h b/src/mongo/db/catalog/collection_catalog.h
index ec55e116c1a..836acd4c9ef 100644
--- a/src/mongo/db/catalog/collection_catalog.h
+++ b/src/mongo/db/catalog/collection_catalog.h
@@ -81,7 +81,9 @@ public:
                  const CollectionCatalog& catalog);
         iterator(OperationContext* opCtx,
                  std::map<std::pair<std::string, CollectionUUID>,
-                          std::shared_ptr<Collection>>::const_iterator mapIter);
+                          std::shared_ptr<Collection>>::const_iterator mapIter,
+                 uint64_t genNum,
+                 const CollectionCatalog& catalog);
         value_type operator*();
         iterator operator++();
         iterator operator++(int);