Fix segfault after unsuccessful connection attempt in libpq

zilder · zilder · commit b3ee00508b27 · 2018-04-24T14:44:59.000+03:00
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -2330,7 +2330,14 @@ PQconnectPoll(PGconn *conn)
 							}
 						}
 						else
+						{
+							/*
+							 * Set current address to the last address as it
+							 * may be used later
+							 */
+							conn->whichaddr = conn->nconnaddr - 1;
 							break;	/* Stop trying */
+						}
 					}
 
 					/*

Original file line number	Diff line number	Diff line change
`@@ -2330,7 +2330,14 @@ PQconnectPoll(PGconn *conn)`
`2330`	`2330`	`}`
`2331`	`2331`	`}`
`2332`	`2332`	`else`
	`2333`	`+ {`
	`2334`	`+ /*`
	`2335`	`+ * Set current address to the last address as it`
	`2336`	`+ * may be used later`
	`2337`	`+ */`
	`2338`	`+ conn->whichaddr = conn->nconnaddr - 1;`
`2333`	`2339`	`break; /* Stop trying */`
	`2340`	`+ }`
`2334`	`2341`	`}`
`2335`	`2342`
`2336`	`2343`	`/*`