Fix a couple of memory leaks in src/bin/pg_basebackup/

michaelpq · michaelpq · commit 2c7395aad7e8 · 2021-07-26T11:14:11.000+09:00
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
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -118,6 +118,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)
@@ -128,6 +129,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;
 			}
 
@@ -141,6 +143,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 			}
 
 			walfile = f;
+			pg_free(fn);
 			return true;
 		}
 		if (size != 0)
@@ -152,6 +155,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 */
@@ -165,9 +169,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;
 }
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
@@ -94,6 +94,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
@@ -254,11 +255,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)
@@ -269,6 +272,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
@@ -625,11 +629,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)
 	{
diff --git a/src/bin/pg_basebackup/walmethods.h b/src/bin/pg_basebackup/walmethods.h
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)`
`118`	`118`	`{`
`119`	`119`	`pg_log_error("could not get size of write-ahead log file \"%s\": %s",`
`120`	`120`	`fn, stream->walmethod->getlasterror());`
	`121`	`+ pg_free(fn);`
`121`	`122`	`return false;`
`122`	`123`	`}`
`123`	`124`	`if (size == WalSegSz)`
`@@ -128,6 +129,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)`
`128`	`129`	`{`
`129`	`130`	`pg_log_error("could not open existing write-ahead log file \"%s\": %s",`
`130`	`131`	`fn, stream->walmethod->getlasterror());`
	`132`	`+ pg_free(fn);`
`131`	`133`	`return false;`
`132`	`134`	`}`
`133`	`135`
`@@ -141,6 +143,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`walfile = f;`
	`146`	`+ pg_free(fn);`
`144`	`147`	`return true;`
`145`	`148`	`}`
`146`	`149`	`if (size != 0)`
`@@ -152,6 +155,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)`
`152`	`155`	`"write-ahead log file \"%s\" has %d bytes, should be 0 or %d",`
`153`	`156`	`size),`
`154`	`157`	`fn, (int) size, WalSegSz);`
	`158`	`+ pg_free(fn);`
`155`	`159`	`return false;`
`156`	`160`	`}`
`157`	`161`	`/* File existed and was empty, so fall through and open */`
`@@ -165,9 +169,11 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)`
`165`	`169`	`{`
`166`	`170`	`pg_log_error("could not open write-ahead log file \"%s\": %s",`
`167`	`171`	`fn, stream->walmethod->getlasterror());`
	`172`	`+ pg_free(fn);`
`168`	`173`	`return false;`
`169`	`174`	`}`
`170`	`175`
	`176`	`+ pg_free(fn);`
`171`	`177`	`walfile = f;`
`172`	`178`	`return true;`
`173`	`179`	`}`