Skip to content

Commit 9709678

Browse files
author
Arthur Zakirov
committed
Fix using uninitialized backup_files_list
1 parent c831b99 commit 9709678

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/backup.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,9 @@ do_backup_database(parray *backup_list)
382382
current.data_bytes += file->write_size;
383383
}
384384

385-
if (backup_files_list)
386-
parray_walk(backup_files_list, pgFileFree);
385+
parray_walk(backup_files_list, pgFileFree);
387386
parray_free(backup_files_list);
387+
backup_files_list = NULL;
388388
}
389389

390390
/*
@@ -1155,11 +1155,14 @@ pg_stop_backup(pgBackup *backup)
11551155
elog(ERROR, "can't write tablespace map file \"%s\": %s",
11561156
tablespace_map, strerror(errno));
11571157

1158-
file = pgFileNew(tablespace_map, true);
1159-
calc_file_checksum(file);
1160-
free(file->path);
1161-
file->path = strdup(PG_TABLESPACE_MAP_FILE);
1162-
parray_append(backup_files_list, file);
1158+
if (backup_files_list)
1159+
{
1160+
file = pgFileNew(tablespace_map, true);
1161+
calc_file_checksum(file);
1162+
free(file->path);
1163+
file->path = strdup(PG_TABLESPACE_MAP_FILE);
1164+
parray_append(backup_files_list, file);
1165+
}
11631166
}
11641167

11651168
if (sscanf(PQgetvalue(res, 0, 3), XID_FMT, &recovery_xid) != 1)

0 commit comments

Comments
 (0)