db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-03 09:59:53 +02:00
Code Issues Releases Activity

Merge pull request #388 from postgrespro/fix_valgrind

Browse Source 
Fix some valgrind alerts
This commit is contained in:
gsmol 2021-05-26 12:15:24 +03:00 committed by GitHub
commit 1fad931140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/data.c
View File

@ -2001,13 +2001,14 @@ send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_f
{
FILE *in = NULL;
FILE *out = NULL;
int hdr_num = -1;
off_t cur_pos_out = 0;
char curr_page[BLCKSZ];
int n_blocks_read = 0;
BlockNumber blknum = 0;
datapagemap_iterator_t *iter = NULL;
int compressed_size = 0;
BackupPageHeader2 *header = NULL;
parray *harray = NULL;
/* stdio buffers */
char *in_buf = NULL;
@ -2046,6 +2047,8 @@ send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_f
setvbuf(in, in_buf, _IOFBF, STDIO_BUFSIZE);
}
harray = parray_new();
while (blknum < file->n_blocks)
{
PageState page_st;
@ -2063,17 +2066,15 @@ send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_f
if (!out)
out = open_local_file_rw(to_fullpath, &out_buf, STDIO_BUFSIZE);
hdr_num++;
header = pgut_new0(BackupPageHeader2);
*header = (BackupPageHeader2){
.block = blknum,
.pos = cur_pos_out,
.lsn = page_st.lsn,
.checksum = page_st.checksum,
};
if (!*headers)
*headers = (BackupPageHeader2 *) pgut_malloc(sizeof(BackupPageHeader2));
else
*headers = (BackupPageHeader2 *) pgut_realloc(*headers, (hdr_num+1) * sizeof(BackupPageHeader2));
(*headers)[hdr_num].block = blknum;
(*headers)[hdr_num].pos = cur_pos_out;
(*headers)[hdr_num].lsn = page_st.lsn;
(*headers)[hdr_num].checksum = page_st.checksum;
parray_append(harray, header);
compressed_size = compress_and_backup_page(file, blknum, in, out, &(file->crc),
rc, curr_page, calg, clevel,
@ -2098,12 +2099,22 @@ send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_f
* Add dummy header, so we can later extract the length of last header
* as difference between their offsets.
*/
if (*headers)
if (parray_num(harray) > 0)
{
file->n_headers = hdr_num +1;
*headers = (BackupPageHeader2 *) pgut_realloc(*headers, (hdr_num+2) * sizeof(BackupPageHeader2));
(*headers)[hdr_num+1].pos = cur_pos_out;
size_t hdr_num = parray_num(harray);
size_t i;
file->n_headers = (int) hdr_num; /* is it valid? */
*headers = (BackupPageHeader2 *) pgut_malloc0((hdr_num + 1) * sizeof(BackupPageHeader2));
for (i = 0; i < hdr_num; i++)
{
header = (BackupPageHeader2 *)parray_get(harray, i);
(*headers)[i] = *header;
pg_free(header);
}
(*headers)[hdr_num] = (BackupPageHeader2){.pos=cur_pos_out};
}
parray_free(harray);
/* cleanup */
if (in && fclose(in))

2
src/restore.c
View File

@ -557,8 +557,8 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
elog(INFO, "shift LSN: %X/%X",
(uint32) (shift_lsn >> 32), (uint32) shift_lsn);
params->shift_lsn = shift_lsn;
}
params->shift_lsn = shift_lsn;
/* for validation or restore with enabled validation */
if (!params->is_restore || !params->no_validate)

2
src/util.c
View File

@ -136,7 +136,7 @@ writeControlFile(ControlFileData *ControlFile, const char *path, fio_location lo
#endif
/* copy controlFileSize */
buffer = pg_malloc(ControlFileSize);
buffer = pg_malloc0(ControlFileSize);
memcpy(buffer, ControlFile, sizeof(ControlFileData));
/* Write pg_control */

11
src/utils/pgut.c
View File

@ -877,6 +877,17 @@ pgut_malloc(size_t size)
return ret;
}
void *
pgut_malloc0(size_t size)
{
char *ret;
ret = pgut_malloc(size);
memset(ret, 0, size);
return ret;
}
void *
pgut_realloc(void *p, size_t size)
{

2
src/utils/pgut.h
View File

@ -59,10 +59,12 @@ extern int pgut_wait(int num, PGconn *connections[], struct timeval *timeout);
* memory allocators
*/
extern void *pgut_malloc(size_t size);
extern void *pgut_malloc0(size_t size);
extern void *pgut_realloc(void *p, size_t size);
extern char *pgut_strdup(const char *str);
#define pgut_new(type) ((type *) pgut_malloc(sizeof(type)))
#define pgut_new0(type) ((type *) pgut_malloc0(sizeof(type)))
#define pgut_newarray(type, n) ((type *) pgut_malloc(sizeof(type) * (n)))
/*