github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid a use-after-free in verbose logging (again)

Browse Source 
Previously, this print would use memory freed by PQClear previously.

Also allocate/free memory to prevent this tiny memory leak.

Signed-off-by: Dan Farina <drfarina@acm.org>
This commit is contained in:
Dan Farina
2010-12-22 15:01:35 -08:00
parent 620974ba04
commit 29c39c21f6
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repmgr.c
View File

@@ -623,8 +623,8 @@ do_standby_clone(void)
char master_control_file[MAXLEN]; char master_control_file[MAXLEN];
char local_control_file[MAXLEN]; char local_control_file[MAXLEN];
const char *first_wal_segment = NULL; char *first_wal_segment = NULL;
const char *last_wal_segment = NULL; const char *last_wal_segment = NULL;
char master_version[MAXVERSIONSTR]; char master_version[MAXVERSIONSTR];
@@ -875,6 +875,16 @@ do_standby_clone(void)
PQfinish(conn); PQfinish(conn);
return; return;
} }
if (verbose)
{
char *first_wal_seg_pq = PQgetvalue(res, 0, 0);
size_t buf_sz = strlen(first_wal_seg_pq);
first_wal_segment = malloc(buf_sz + 1);
xsnprintf(first_wal_segment, buf_sz, "%s", first_wal_seg_pq);
}
first_wal_segment = PQgetvalue(res, 0, 0); first_wal_segment = PQgetvalue(res, 0, 0);
PQclear(res); PQclear(res);
@@ -976,10 +986,19 @@ stop_backup:
last_wal_segment = PQgetvalue(res, 0, 0); last_wal_segment = PQgetvalue(res, 0, 0);
if (verbose) if (verbose)
{
printf( printf(
_("%s requires primary to keep WAL files %s until at least %s\n"), _("%s requires primary to keep WAL files %s until at least %s\n"),
progname, first_wal_segment, last_wal_segment); progname, first_wal_segment, last_wal_segment);
/*
* Only free the first_wal_segment since it was copied out of the
* pqresult.
*/
free(first_wal_segment);
first_wal_segment = NULL;
}
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);