From 4777fc98ee642b99c2bdab250e2a6311ee3022e6 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 3 Jul 2024 09:12:12 +0200 Subject: [PATCH 2/2] Add fastpaths for when no objects are found If there are no objects found, there is no reason to inspect the result columns and mallocing a zero-sized (which will be 1 byte in reality) heap buffer for it. Add fast-paths like how other object inspection functions are already doing it. --- src/bin/pg_dump/pg_dump.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 7ccf943522..6e0ddb637e 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -4222,6 +4222,9 @@ getPublications(Archive *fout) ntups = PQntuples(res); + if (ntups == 0) + goto cleanup; + i_tableoid = PQfnumber(res, "tableoid"); i_oid = PQfnumber(res, "oid"); i_pubname = PQfnumber(res, "pubname"); @@ -4260,6 +4263,8 @@ getPublications(Archive *fout) /* Decide whether we want to dump it */ selectDumpableObject(&(pubinfo[i].dobj), fout); } + +cleanup: PQclear(res); destroyPQExpBuffer(query); @@ -5701,6 +5706,8 @@ getExtensions(Archive *fout, int *numExtensions) res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK); ntups = PQntuples(res); + if (ntups == 0) + goto cleanup; extinfo = (ExtensionInfo *) pg_malloc(ntups * sizeof(ExtensionInfo)); @@ -5730,6 +5737,7 @@ getExtensions(Archive *fout, int *numExtensions) selectDumpableExtension(&(extinfo[i]), dopt); } +cleanup: PQclear(res); destroyPQExpBuffer(query); -- 2.39.3 (Apple Git-146)