SERVER-6647 Potential out of bounds access in ReplicaSetMonitor

Dan Pasette · Dan Pasette · commit 239d7d6a195f · 2012-10-15T17:17:09.000-04:00
Backport of commit f86f60a
diff --git a/client/dbclient_rs.cpp b/client/dbclient_rs.cpp
@@ -625,7 +625,10 @@ namespace mongo {
                     {
                         scoped_lock lk( _lock );
                         probablePrimaryIdx = _find_inlock( maybePrimary );
-                        probablePrimaryConn = _nodes[probablePrimaryIdx].conn;
+
+                        if (probablePrimaryIdx >= 0) {
+                            probablePrimaryConn = _nodes[probablePrimaryIdx].conn;
+                        }
                     }
 
                     if ( probablePrimaryIdx >= 0 ) {

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,10 @@ namespace mongo {`
`625`	`625`	`{`
`626`	`626`	`scoped_lock lk( _lock );`
`627`	`627`	`probablePrimaryIdx = _find_inlock( maybePrimary );`
`628`		`- probablePrimaryConn = _nodes[probablePrimaryIdx].conn;`
	`628`	`+`
	`629`	`+ if (probablePrimaryIdx >= 0) {`
	`630`	`+ probablePrimaryConn = _nodes[probablePrimaryIdx].conn;`
	`631`	`+ }`
`629`	`632`	`}`
`630`	`633`
`631`	`634`	`if ( probablePrimaryIdx >= 0 ) {`