mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-30 00:57:19 +02:00
Fix a couple of memory leaks in src/bin/pg_basebackup/
These have been introduced by 7fbe0c8
, and could happen for
pg_basebackup and pg_receivewal.
Per report from Coverity for the ones in walmethods.c, I have spotted
the ones in receivelog.c after more review.
Backpatch-through: 10
This commit is contained in:
parent
1bcfda30fb
commit
c4ef3b81b8
@ -121,6 +121,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
|
||||
{
|
||||
pg_log_error("could not get size of write-ahead log file \"%s\": %s",
|
||||
fn, stream->walmethod->getlasterror());
|
||||
pg_free(fn);
|
||||
return false;
|
||||
}
|
||||
if (size == WalSegSz)
|
||||
@ -131,6 +132,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
|
||||
{
|
||||
pg_log_error("could not open existing write-ahead log file \"%s\": %s",
|
||||
fn, stream->walmethod->getlasterror());
|
||||
pg_free(fn);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -139,11 +141,13 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
|
||||
{
|
||||
pg_log_error("could not fsync existing write-ahead log file \"%s\": %s",
|
||||
fn, stream->walmethod->getlasterror());
|
||||
pg_free(fn);
|
||||
stream->walmethod->close(f, CLOSE_UNLINK);
|
||||
return false;
|
||||
}
|
||||
|
||||
walfile = f;
|
||||
pg_free(fn);
|
||||
return true;
|
||||
}
|
||||
if (size != 0)
|
||||
@ -155,6 +159,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
|
||||
"write-ahead log file \"%s\" has %d bytes, should be 0 or %d",
|
||||
size),
|
||||
fn, (int) size, WalSegSz);
|
||||
pg_free(fn);
|
||||
return false;
|
||||
}
|
||||
/* File existed and was empty, so fall through and open */
|
||||
@ -168,9 +173,11 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
|
||||
{
|
||||
pg_log_error("could not open write-ahead log file \"%s\": %s",
|
||||
fn, stream->walmethod->getlasterror());
|
||||
pg_free(fn);
|
||||
return false;
|
||||
}
|
||||
|
||||
pg_free(fn);
|
||||
walfile = f;
|
||||
return true;
|
||||
}
|
||||
|
@ -95,6 +95,7 @@ dir_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
|
||||
filename = dir_get_file_name(pathname, temp_suffix);
|
||||
snprintf(tmppath, sizeof(tmppath), "%s/%s",
|
||||
dir_data->basedir, filename);
|
||||
pg_free(filename);
|
||||
|
||||
/*
|
||||
* Open a file for non-compressed as well as compressed files. Tracking
|
||||
@ -255,11 +256,13 @@ dir_close(Walfile f, WalCloseMethod method)
|
||||
filename = dir_get_file_name(df->pathname, df->temp_suffix);
|
||||
snprintf(tmppath, sizeof(tmppath), "%s/%s",
|
||||
dir_data->basedir, filename);
|
||||
pg_free(filename);
|
||||
|
||||
/* permanent name, so no need for the prefix */
|
||||
filename2 = dir_get_file_name(df->pathname, NULL);
|
||||
snprintf(tmppath2, sizeof(tmppath2), "%s/%s",
|
||||
dir_data->basedir, filename2);
|
||||
pg_free(filename2);
|
||||
r = durable_rename(tmppath, tmppath2);
|
||||
}
|
||||
else if (method == CLOSE_UNLINK)
|
||||
@ -270,6 +273,7 @@ dir_close(Walfile f, WalCloseMethod method)
|
||||
filename = dir_get_file_name(df->pathname, df->temp_suffix);
|
||||
snprintf(tmppath, sizeof(tmppath), "%s/%s",
|
||||
dir_data->basedir, filename);
|
||||
pg_free(filename);
|
||||
r = unlink(tmppath);
|
||||
}
|
||||
else
|
||||
@ -626,11 +630,14 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
|
||||
if (tarCreateHeader(tar_data->currentfile->header, tmppath, NULL, 0, S_IRUSR | S_IWUSR, 0, 0, time(NULL)) != TAR_OK)
|
||||
{
|
||||
pg_free(tar_data->currentfile);
|
||||
pg_free(tmppath);
|
||||
tar_data->currentfile = NULL;
|
||||
tar_set_error("could not create tar header");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pg_free(tmppath);
|
||||
|
||||
#ifdef HAVE_LIBZ
|
||||
if (tar_data->compression)
|
||||
{
|
||||
|
@ -53,8 +53,8 @@ struct WalWriteMethod
|
||||
ssize_t (*get_file_size) (const char *pathname);
|
||||
|
||||
/*
|
||||
* Return the name of the current file to work on, without the base
|
||||
* directory. This is useful for logging.
|
||||
* Return the name of the current file to work on in pg_malloc()'d string,
|
||||
* without the base directory. This is useful for logging.
|
||||
*/
|
||||
char *(*get_file_name) (const char *pathname, const char *temp_suffix);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user