Parse libpq's "keepalives" option more like other integer options.

tglsfdc · tglsfdc · commit 920d51979a99 · 2024-10-02T17:30:36.000-04:00
Use pqParseIntParam (nee parse_int_param) instead of using strtol directly. This allows trailing whitespace, which the previous coding didn't, and makes the spelling of the error message consistent with other similar cases. This seems to be an oversight in commit e7a2217, which introduced parse_int_param. That fixed places that were using atoi(), but missed this place which was randomly using strtol() instead. Ordinarily I'd consider this minor cleanup not worth back-patching. However, it seems that ecpg assumes it can add trailing whitespace to URL parameters, so that use of the keepalives option fails in that context. Perhaps that's worth improving as a separate matter. In the meantime, back-patch this to all supported branches. Yuto Sasaki (some further cleanup by me) Discussion: https://postgr.es/m/TY2PR01MB36286A7B97B9A15793335D18C1772@TY2PR01MB3628.jpnprd01.prod.outlook.com
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -2169,14 +2169,14 @@ connectFailureMessage(PGconn *conn, int errorno)
 static int
 useKeepalives(PGconn *conn)
 {
-	char	   *ep;
 	int			val;
 
 	if (conn->keepalives == NULL)
 		return 1;
-	val = strtol(conn->keepalives, &ep, 10);
-	if (*ep)
+
+	if (!pqParseIntParam(conn->keepalives, &val, conn, "keepalives"))
 		return -1;
+
 	return val != 0 ? 1 : 0;
 }
 
@@ -3084,7 +3084,7 @@ PQconnectPoll(PGconn *conn)
 
 						if (usekeepalives < 0)
 						{
-							libpq_append_conn_error(conn, "keepalives parameter must be an integer");
+							/* error is already reported */
 							err = 1;
 						}
 						else if (usekeepalives == 0)

Original file line number	Diff line number	Diff line change
`@@ -2169,14 +2169,14 @@ connectFailureMessage(PGconn *conn, int errorno)`
`2169`	`2169`	`static int`
`2170`	`2170`	`useKeepalives(PGconn *conn)`
`2171`	`2171`	`{`
`2172`		`- char *ep;`
`2173`	`2172`	`int val;`
`2174`	`2173`
`2175`	`2174`	`if (conn->keepalives == NULL)`
`2176`	`2175`	`return 1;`
`2177`		`- val = strtol(conn->keepalives, &ep, 10);`
`2178`		`- if (*ep)`
	`2176`	`+`
	`2177`	`+ if (!pqParseIntParam(conn->keepalives, &val, conn, "keepalives"))`
`2179`	`2178`	`return -1;`
	`2179`	`+`
`2180`	`2180`	`return val != 0 ? 1 : 0;`
`2181`	`2181`	`}`
`2182`	`2182`
`@@ -3084,7 +3084,7 @@ PQconnectPoll(PGconn *conn)`
`3084`	`3084`
`3085`	`3085`	`if (usekeepalives < 0)`
`3086`	`3086`	`{`
`3087`		`- libpq_append_conn_error(conn, "keepalives parameter must be an integer");`
	`3087`	`+ /* error is already reported */`
`3088`	`3088`	`err = 1;`
`3089`	`3089`	`}`
`3090`	`3090`	`else if (usekeepalives == 0)`