SERVER-7498 Check config is not null before dereferencing

mongodb · Nov 6, 2012 · ea86be5 · ea86be5
1 parent d7fe5dc
commit ea86be5
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/mongo/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp
@@ -138,6 +138,8 @@ namespace mongo {
             return target;
         }
 
+        Member* primary = const_cast<Member*>(box.getPrimary());
+
         // wait for 2N pings before choosing a sync target
         if (_cfg) {
             int needMorePings = config().members.size()*2 - HeartbeatInfo::numPings;
@@ -148,14 +150,12 @@ namespace mongo {
             }
 
             buildIndexes = myConfig().buildIndexes;
-        }
 
-        Member* primary = const_cast<Member*>(box.getPrimary());
+            // If we are only allowed to sync from the primary, return that
-
+            if (!_cfg->chainingAllowed()) {
-        // If we are only allowed to sync from the primary, return that
+                // Returns NULL if we cannot reach the primary
-        if (!config().chainingAllowed()) {
+                return primary;
-            // Returns NULL if we cannot reach the primary
+            }
-            return primary;
         }
 
         // find the member with the lowest ping time that has more data than me