diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/receivelog.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index f7ba79188c1..6b6e32dfbdf 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -803,6 +803,10 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream, sleeptime = CalculateCopyStreamSleeptime(now, stream->standby_message_timeout, last_status); + /* Done with any prior message */ + PQfreemem(copybuf); + copybuf = NULL; + r = CopyStreamReceive(conn, sleeptime, stream->stop_socket, ©buf); while (r != 0) { @@ -814,8 +818,8 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream, if (res == NULL) goto error; - else - return res; + PQfreemem(copybuf); + return res; } /* Check the message type. */ @@ -844,6 +848,10 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream, goto error; } + /* Done with that message */ + PQfreemem(copybuf); + copybuf = NULL; + /* * Process the received data, and any subsequent data we can read * without blocking. @@ -920,8 +928,8 @@ CopyStreamPoll(PGconn *conn, long timeout_ms, pgsocket stop_socket) * maximum of 'timeout' ms. * * If data was received, returns the length of the data. *buffer is set to - * point to a buffer holding the received message. The buffer is only valid - * until the next CopyStreamReceive call. + * point to a buffer holding the received message. The caller must eventually + * free the buffer with PQfreemem(). * * Returns 0 if no data was available within timeout, or if wait was * interrupted by signal or stop_socket input. @@ -934,8 +942,8 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket, char *copybuf = NULL; int rawlen; - PQfreemem(*buffer); - *buffer = NULL; + /* Caller should have cleared any prior buffer */ + Assert(*buffer == NULL); /* Try to receive a CopyData message */ rawlen = PQgetCopyData(conn, ©buf, 1); @@ -1198,7 +1206,6 @@ HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream, char *copybuf, } still_sending = false; } - PQfreemem(copybuf); *stoppos = blockpos; return res; } |