PHPC-1468: Fix segfault on isMaster failure

mattklein123 · jmikola · commit 3577b76c225a · 2016-04-14T11:31:37.000-04:00
diff --git a/mcon/manager.c b/mcon/manager.c
@@ -429,11 +429,9 @@ static mongo_connection *mongo_get_connection_multiple(mongo_con_manager *manage
 					 * later on, but we should continue to aggregate the errors in case more
 					 * servers are unsupported */
 					if (ismaster_error == 4) {
-						mongo_manager_connection_deregister(manager, tmp);
 						found_supported_wire_version = 0;
-					} else {
-						mongo_connection_destroy(manager, tmp, MONGO_CLOSE_BROKEN);
 					}
+					mongo_manager_connection_deregister(manager, tmp);
 					tmp = NULL;
 					found_connected_server--;
 			}

Original file line number	Diff line number	Diff line change
`@@ -429,11 +429,9 @@ static mongo_connection mongo_get_connection_multiple(mongo_con_manager manage`
`429`	`429`	`* later on, but we should continue to aggregate the errors in case more`
`430`	`430`	`* servers are unsupported */`
`431`	`431`	`if (ismaster_error == 4) {`
`432`		`- mongo_manager_connection_deregister(manager, tmp);`
`433`	`432`	`found_supported_wire_version = 0;`
`434`		`- } else {`
`435`		`- mongo_connection_destroy(manager, tmp, MONGO_CLOSE_BROKEN);`
`436`	`433`	`}`
	`434`	`+ mongo_manager_connection_deregister(manager, tmp);`
`437`	`435`	`tmp = NULL;`
`438`	`436`	`found_connected_server--;`
`439`	`437`	`}`