db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-17 01:12:23 +02:00
Code Issues Releases Activity

Refactor functions in postgres/interface module and fix leak.

Browse Source 
pgLsnFromWalSegment() leaked two Strings.

Refactor pgLsnRangeToWalSegmentList() to create the StringList in the calling context rather than moving it later.
This commit is contained in:
David Steele
2022-04-26 12:09:44 -04:00
parent a56fa0eb45
commit cca6df872a
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/postgres/interface.c
View File

@ -498,7 +498,7 @@ pgLsnToWalSegment(uint32_t timeline, uint64_t lsn, unsigned int walSegmentSize)
} }
uint64_t uint64_t
pgLsnFromWalSegment(const String *walSegment, unsigned int walSegmentSize) pgLsnFromWalSegment(const String *const walSegment, const unsigned int walSegmentSize)
{ {
FUNCTION_TEST_BEGIN(); FUNCTION_TEST_BEGIN();
FUNCTION_TEST_PARAM(STRING, walSegment); FUNCTION_TEST_PARAM(STRING, walSegment);
@ -509,10 +509,17 @@ pgLsnFromWalSegment(const String *walSegment, unsigned int walSegmentSize)
ASSERT(strSize(walSegment) == 24); ASSERT(strSize(walSegment) == 24);
ASSERT(walSegmentSize > 0); ASSERT(walSegmentSize > 0);
FUNCTION_TEST_RETURN( uint64_t result;
UINT64,
MEM_CONTEXT_TEMP_BEGIN()
{
result =
(cvtZToUInt64Base(strZ(strSubN(walSegment, 8, 8)), 16) << 32) + (cvtZToUInt64Base(strZ(strSubN(walSegment, 8, 8)), 16) << 32) +
(cvtZToUInt64Base(strZ(strSubN(walSegment, 16, 8)), 16) * walSegmentSize)); (cvtZToUInt64Base(strZ(strSubN(walSegment, 16, 8)), 16) * walSegmentSize);
}
MEM_CONTEXT_TEMP_END();
FUNCTION_TEST_RETURN(UINT64, result);
} }
/**********************************************************************************************************************************/ /**********************************************************************************************************************************/
@ -537,7 +544,8 @@ pgTimelineFromWalSegment(const String *const walSegment)
/**********************************************************************************************************************************/ /**********************************************************************************************************************************/
StringList * StringList *
pgLsnRangeToWalSegmentList( pgLsnRangeToWalSegmentList(
unsigned int pgVersion, uint32_t timeline, uint64_t lsnStart, uint64_t lsnStop, unsigned int walSegmentSize) const unsigned int pgVersion, const uint32_t timeline, const uint64_t lsnStart, const uint64_t lsnStop,
const unsigned int walSegmentSize)
{ {
FUNCTION_TEST_BEGIN(); FUNCTION_TEST_BEGIN();
FUNCTION_TEST_PARAM(UINT, pgVersion); FUNCTION_TEST_PARAM(UINT, pgVersion);
@ -553,23 +561,21 @@ pgLsnRangeToWalSegmentList(
ASSERT(walSegmentSize != 0); ASSERT(walSegmentSize != 0);
ASSERT(pgVersion > PG_VERSION_92 || walSegmentSize == PG_WAL_SEGMENT_SIZE_DEFAULT); ASSERT(pgVersion > PG_VERSION_92 || walSegmentSize == PG_WAL_SEGMENT_SIZE_DEFAULT);
StringList *result = NULL; StringList *const result = strLstNew();
MEM_CONTEXT_TEMP_BEGIN() MEM_CONTEXT_TEMP_BEGIN()
{ {
result = strLstNew();
// Skip the FF segment when PostgreSQL <= 9.2 (in this case segment size should always be 16MB) // Skip the FF segment when PostgreSQL <= 9.2 (in this case segment size should always be 16MB)
bool skipFF = pgVersion <= PG_VERSION_92; const bool skipFF = pgVersion <= PG_VERSION_92;
// Calculate the start and stop segments // Calculate the start and stop segments
unsigned int startMajor = (unsigned int)(lsnStart >> 32); unsigned int startMajor = (unsigned int)(lsnStart >> 32);
unsigned int startMinor = (unsigned int)(lsnStart & 0xFFFFFFFF) / walSegmentSize; unsigned int startMinor = (unsigned int)(lsnStart & 0xFFFFFFFF) / walSegmentSize;
unsigned int stopMajor = (unsigned int)(lsnStop >> 32); const unsigned int stopMajor = (unsigned int)(lsnStop >> 32);
unsigned int stopMinor = (unsigned int)(lsnStop & 0xFFFFFFFF) / walSegmentSize; const unsigned int stopMinor = (unsigned int)(lsnStop & 0xFFFFFFFF) / walSegmentSize;
unsigned int minorPerMajor = 0xFFFFFFFF / walSegmentSize; const unsigned int minorPerMajor = 0xFFFFFFFF / walSegmentSize;
// Create list // Create list
strLstAddFmt(result, "%08X%08X%08X", timeline, startMajor, startMinor); strLstAddFmt(result, "%08X%08X%08X", timeline, startMajor, startMinor);
@ -586,8 +592,6 @@ pgLsnRangeToWalSegmentList(
strLstAddFmt(result, "%08X%08X%08X", timeline, startMajor, startMinor); strLstAddFmt(result, "%08X%08X%08X", timeline, startMajor, startMinor);
} }
strLstMove(result, memContextPrior());
} }
MEM_CONTEXT_TEMP_END(); MEM_CONTEXT_TEMP_END();