From 369d494a4f5c1494a46adcf5c56f5462a83ef20d Mon Sep 17 00:00:00 2001 From: Stephen Frost Date: Thu, 6 Dec 2018 11:11:21 -0500 Subject: [PATCH] Cleanup minor pg_dump memory leaks In dumputils, we may have successfully parsed the acls when we discover that we can't parse the reverse ACLs and then return- check and free aclitems if that happens. In dumpTableSchema, move ftoptions and srvname under the relkind != RELKIND_VIEW branch (since they're only used there) and then check if they've been allocated and, if so, free them at the end of that block. Pointed out by Pavel Raiskup, though I didn't use those patches. Discussion: https://postgr.es/m/2183976.vkCJMhdhmF@nb.usersys.redhat.com --- src/bin/pg_dump/dumputils.c | 2 ++ src/bin/pg_dump/pg_dump.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 8a93ace9fa..475d6dbd73 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -95,6 +95,8 @@ buildACLCommands(const char *name, const char *subname, const char *nspname, { if (!parsePGArray(racls, &raclitems, &nraclitems)) { + if (aclitems) + free(aclitems); if (raclitems) free(raclitems); return false; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d583154fba..637c79af48 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -15303,8 +15303,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) int actual_atts; /* number of attrs in this CREATE statement */ const char *reltypename; char *storage; - char *srvname; - char *ftoptions; int j, k; @@ -15361,6 +15359,9 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) } else { + char *ftoptions = NULL; + char *srvname = NULL; + switch (tbinfo->relkind) { case RELKIND_FOREIGN_TABLE: @@ -15397,13 +15398,9 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) } case RELKIND_MATVIEW: reltypename = "MATERIALIZED VIEW"; - srvname = NULL; - ftoptions = NULL; break; default: reltypename = "TABLE"; - srvname = NULL; - ftoptions = NULL; } numParents = tbinfo->numParents; @@ -15951,6 +15948,11 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) tbinfo->attfdwoptions[j]); } } + + if (ftoptions) + free(ftoptions); + if (srvname) + free(srvname); } /* -- 2.40.0