diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-06-16 21:50:56 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-07-03 11:47:15 +0200 |
| commit | 02c408e21a6e78ff246ea7a1beb4669634fa9c4c (patch) | |
| tree | 7e4cf03f3de7e32af266b739e12c6600d871ed45 /src/bin/pg_dump/dumputils.c | |
| parent | 098c703d308fa88dc9e3f9f623ca023ce4717794 (diff) | |
| download | postgresql-02c408e21a6e78ff246ea7a1beb4669634fa9c4c.tar.gz postgresql-02c408e21a6e78ff246ea7a1beb4669634fa9c4c.zip | |
Remove redundant null pointer checks before free()
Per applicable standards, free() with a null pointer is a no-op.
Systems that don't observe that are ancient and no longer relevant.
Some PostgreSQL code already required this behavior, so this change
does not introduce any new requirements, just makes the code more
consistent.
Discussion: https://www.postgresql.org/message-id/flat/dac5d2d0-98f5-94d9-8e69-46da2413593d%40enterprisedb.com
Diffstat (limited to 'src/bin/pg_dump/dumputils.c')
| -rw-r--r-- | src/bin/pg_dump/dumputils.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 3e68dfc78f9..6e501a54138 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -98,18 +98,15 @@ buildACLCommands(const char *name, const char *subname, const char *nspname, /* Parse the acls array */ if (!parsePGArray(acls, &aclitems, &naclitems)) { - if (aclitems) - free(aclitems); + free(aclitems); return false; } /* Parse the baseacls too */ if (!parsePGArray(baseacls, &baseitems, &nbaseitems)) { - if (aclitems) - free(aclitems); - if (baseitems) - free(baseitems); + free(aclitems); + free(baseitems); return false; } @@ -298,14 +295,10 @@ buildACLCommands(const char *name, const char *subname, const char *nspname, destroyPQExpBuffer(firstsql); destroyPQExpBuffer(secondsql); - if (aclitems) - free(aclitems); - if (baseitems) - free(baseitems); - if (grantitems) - free(grantitems); - if (revokeitems) - free(revokeitems); + free(aclitems); + free(baseitems); + free(grantitems); + free(revokeitems); return ok; } |