postgres.git / summary / log / commit / refs

commit    8703cdec2055d055583ca17ef2d2b5052b064a15
Author:   Nathan Bossart <nathan@postgresql.org>
Date:     Tue Feb 04 19:26:57 2025 +0000
First released in: 18.0, 13.19, 14.16, 15.11, 16.7, 17.3

    vacuumdb: Add missing PQfinish() calls to vacuum_one_database().
    
    A few of the version checks in vacuum_one_database() do not call
    PQfinish() before exiting.  This precedent was unintentionally
    established in commit 00d1e88d36, and while it's probably not too
    problematic, it seems better to properly close the connection.
    
    Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
    Discussion: https://postgr.es/m/Z6JAwqN1I8ljTuXp%40nathan
    Backpatch-through: 13


 src/bin/scripts/vacuumdb.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 260540f1894..430582cef53 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -558,20 +558,32 @@ vacuum_one_database(ConnParams *cparams,
 	}
 
 	if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)
+	{
+		PQfinish(conn);
 		pg_fatal("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 				 "--min-xid-age", "9.6");
+	}
 
 	if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)
+	{
+		PQfinish(conn);
 		pg_fatal("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 				 "--min-mxid-age", "9.6");
+	}
 
 	if (vacopts->parallel_workers >= 0 && PQserverVersion(conn) < 130000)
+	{
+		PQfinish(conn);
 		pg_fatal("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 				 "--parallel", "13");
+	}
 
 	if (vacopts->buffer_usage_limit && PQserverVersion(conn) < 160000)
+	{
+		PQfinish(conn);
 		pg_fatal("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 				 "--buffer-usage-limit", "16");
+	}
 
 	/* skip_database_stats is used automatically if server supports it */
 	vacopts->skip_database_stats = (PQserverVersion(conn) >= 160000);


[parent: 254834943388]