From d73b7f973db5ec7e44813141741d3e0d318eef69 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 3 Jun 2012 11:52:52 -0400
Subject: [PATCH] Fix memory leaks in failure paths in buildACLCommands and
parseAclItem.
This is currently only cosmetic, since all the call sites just curl up
and die in event of a failure return. It might be important for some
future use-case, though, and in any case it quiets warnings from the
clang static analyzer (as reported by Anna Zaks).
Josh Kupershmidt
---
src/bin/pg_dump/dumputils.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index 623c250eb89..6d10970e7c8 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -600,7 +600,10 @@ buildACLCommands(const char *name, const char *subname,
{
if (!parseAclItem(aclitems[i], type, name, subname, remoteVersion,
grantee, grantor, privs, privswgo))
+ {
+ free(aclitems);
return false;
+ }
if (grantor->len == 0 && owner)
printfPQExpBuffer(grantor, "%s", owner);
@@ -789,7 +792,10 @@ parseAclItem(const char *item, const char *type,
/* user or group name is string up to = */
eqpos = copyAclUserName(grantee, buf);
if (*eqpos != '=')
+ {
+ free(buf);
return false;
+ }
/* grantor may be listed after / */
slpos = strchr(eqpos + 1, '/');
@@ -798,7 +804,10 @@ parseAclItem(const char *item, const char *type,
*slpos++ = '\0';
slpos = copyAclUserName(grantor, slpos);
if (*slpos != '\0')
+ {
+ free(buf);
return false;
+ }
}
else
resetPQExpBuffer(grantor);
--
GitLab