Fix error reporting of connect_timeout in libpq for value parsing

michaelpq · michaelpq · commit ba19a6b73c5b · 2019-10-21T11:39:15.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
@@ -2025,7 +2025,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
`@@ -2025,7 +2025,11 @@ connectDBComplete(PGconn *conn)`
`2025`	`2025`	`{`
`2026`	`2026`	`if (!parse_int_param(conn->connect_timeout, &timeout, conn,`
`2027`	`2027`	`"connect_timeout"))`
	`2028`	`+ {`
	`2029`	`+ /* mark the connection as bad to report the parsing failure */`
	`2030`	`+ conn->status = CONNECTION_BAD;`
`2028`	`2031`	`return 0;`
	`2032`	`+ }`
`2029`	`2033`
`2030`	`2034`	`if (timeout > 0)`
`2031`	`2035`	`{`