Fix error reporting of connect_timeout in libpq for value parsing

michaelpq · michaelpq · commit ed5109a616cf · 2019-10-21T11:39:28.000+09:00
The logic was correctly detecting a parsing failure, but the parsing error did not get reported back to the client properly. Reported-by: Ed Morley Author: Lars Kanis Reviewed-by: Michael Paquier Discussion: https://postgr.es/m/a9b4cbd7-4ecb-06b2-ebd7-1739bbff3217@greiz-reinsdorf.de Backpatch-through: 12
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -1992,7 +1992,11 @@ connectDBComplete(PGconn *conn)
 	{
 		if (!parse_int_param(conn->connect_timeout, &timeout, conn,
 							 "connect_timeout"))
+		{
+			/* mark the connection as bad to report the parsing failure */
+			conn->status = CONNECTION_BAD;
 			return 0;
+		}
 
 		if (timeout > 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1992,7 +1992,11 @@ connectDBComplete(PGconn *conn)`
`1992`	`1992`	`{`
`1993`	`1993`	`if (!parse_int_param(conn->connect_timeout, &timeout, conn,`
`1994`	`1994`	`"connect_timeout"))`
	`1995`	`+ {`
	`1996`	`+ /* mark the connection as bad to report the parsing failure */`
	`1997`	`+ conn->status = CONNECTION_BAD;`
`1995`	`1998`	`return 0;`
	`1999`	`+ }`
`1996`	`2000`
`1997`	`2001`	`if (timeout > 0)`
`1998`	`2002`	`{`