diff options
author | Stephen Frost <sfrost@snowman.net> | 2014-01-24 15:10:08 -0500 |
---|---|---|
committer | Stephen Frost <sfrost@snowman.net> | 2014-01-24 15:10:08 -0500 |
commit | 6794a9f9a194e24862e60a918eac031b7641686c (patch) | |
tree | cdc02da5bf1ba3dcd0a5c1739910666fc299d318 | |
parent | d150ff57812ae01a2f78a55f33a46f9b7febf933 (diff) | |
download | postgresql-6794a9f9a194e24862e60a918eac031b7641686c.tar.gz postgresql-6794a9f9a194e24862e60a918eac031b7641686c.zip |
Avoid minor leak in parallel pg_dump
During parallel pg_dump, a worker process closing the connection caused
a minor memory leak (particularly minor as we are likely about to exit
anyway). Instead, free the memory in this case prior to returning NULL
to indicate connection closed.
Spotting by the Coverity scanner.
Back patch to 9.3 where this was introduced.
-rw-r--r-- | src/bin/pg_dump/parallel.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index d252f9b7896..6f2634bb641 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -1288,7 +1288,7 @@ readMessageFromPipe(int fd) /* worker has closed the connection or another error happened */ if (ret <= 0) - return NULL; + break; Assert(ret == 1); @@ -1303,6 +1303,14 @@ readMessageFromPipe(int fd) msg = (char *) realloc(msg, bufsize); } } + + /* + * Worker has closed the connection, make sure to clean up before return + * since we are not returning msg (but did allocate it). + */ + free(msg); + + return NULL; } #ifdef WIN32 |