From 8b63f89498f2e3ff0e1d420b023ccb76c34c2cda Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 11 Feb 2015 18:35:23 -0500 Subject: [PATCH] Fix more memory leaks in failure path in buildACLCommands. We already had one go at this issue in commit d73b7f973db5ec7e, but we failed to notice that buildACLCommands also leaked several PQExpBuffers along with a simply malloc'd string. This time let's try to make the fix a bit more future-proof by eliminating the separate exit path. It's still not exactly critical because pg_dump will curl up and die on failure; but since the amount of the potential leak is now several KB, it seems worth back-patching as far as 9.2 where the previous fix landed. Per Coverity, which evidently is smarter than clang's static analyzer. --- src/bin/pg_dump/dumputils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index a92e4dcd60..b4edf21674 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -531,6 +531,7 @@ buildACLCommands(const char *name, const char *subname, const char *prefix, int remoteVersion, PQExpBuffer sql) { + bool ok = true; char **aclitems; int naclitems; int i; @@ -601,8 +602,8 @@ buildACLCommands(const char *name, const char *subname, if (!parseAclItem(aclitems[i], type, name, subname, remoteVersion, grantee, grantor, privs, privswgo)) { - free(aclitems); - return false; + ok = false; + break; } if (grantor->len == 0 && owner) @@ -709,7 +710,7 @@ buildACLCommands(const char *name, const char *subname, free(aclitems); - return true; + return ok; } /* -- 2.40.0