1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always pfree strings returned by GetDatabasePath

Browse Source 
Several places didn't do it, and in many cases it didn't matter because
it would be a small allocation in a short-lived context; but other
places may accumulate a few (for example, in CreateDatabaseUsingFileCopy,
one per tablespace).  In most databases this is highly unlikely to be
very serious either, but it seems better to make the code consistent in
case there's future copy-and-paste.

The only case of actual concern seems to be the aforementioned routine,
which is new with commit 9c08aea6a309, so there's no need to backpatch.

As pointed out by Coverity.
This commit is contained in:
Alvaro Herrera 2022-04-25 10:32:13 +02:00
parent f819020d40
commit 0bd56172b2
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/commands/dbcommands.c
View File

@ -217,6 +217,8 @@ CreateDatabaseUsingWalLog(Oid src_dboid, Oid dst_dboid,
UnlockRelationId(&dstrelid, AccessShareLock);
}
pfree(srcpath);
pfree(dstpath);
list_free_deep(rnodelist);
}
@ -628,6 +630,8 @@ CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dst_dboid, Oid src_tsid,
(void) XLogInsert(RM_DBASE_ID,
XLOG_DBASE_CREATE_FILE_COPY | XLR_SPECIAL_REL_UPDATE);
}
pfree(srcpath);
pfree(dstpath);
}
table_endscan(scan);
table_close(rel, AccessShareLock);
@ -2128,6 +2132,9 @@ movedb(const char *dbname, const char *tblspcname)
/* Now it's safe to release the database lock */
UnlockSharedObjectForSession(DatabaseRelationId, db_id, 0,
AccessExclusiveLock);
pfree(src_dbpath);
pfree(dst_dbpath);
}
/* Error cleanup callback for movedb */
@ -2141,6 +2148,8 @@ movedb_failure_callback(int code, Datum arg)
dstpath = GetDatabasePath(fparms->dest_dboid, fparms->dest_tsoid);
(void) rmtree(dstpath, true);
pfree(dstpath);
}
/*
@ -3051,6 +3060,9 @@ dbase_redo(XLogReaderState *record)
* We don't need to copy subdirectories
*/
copydir(src_path, dst_path, false);
pfree(src_path);
pfree(dst_path);
}
else if (info == XLOG_DBASE_CREATE_WAL_LOG)
{
@ -3063,6 +3075,7 @@ dbase_redo(XLogReaderState *record)
/* Create the database directory with the version file. */
CreateDirAndVersionFile(dbpath, xlrec->db_id, xlrec->tablespace_id,
true);
pfree(dbpath);
}
else if (info == XLOG_DBASE_DROP)
{

1
src/backend/utils/init/postinit.c
View File

@ -1057,6 +1057,7 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
}
SetDatabasePath(fullpath);
pfree(fullpath);
/*
* It's now possible to do real access to the system catalogs.