upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-07-10 02:01:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve writing map.dat preamble

Browse source 
Fix code from commit 763aaa06f0

Suggestion from Alvaro Herrera following a bug discovered by Coverity.
This commit is contained in:
Andrew Dunstan 2026-03-04 16:08:04 -05:00
parent 01c729e0c7
commit c7572cd48d
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/bin/pg_dump/pg_dumpall.c
View file

@ -2019,19 +2019,6 @@ dumpDatabases(PGconn *conn)
if (archDumpFormat != archNull) if (archDumpFormat != archNull)
{ {
char map_file_path[MAXPGPATH]; char map_file_path[MAXPGPATH];
char *map_preamble[] = {
"#################################################################",
"# map.dat",
"#",
"# This file maps oids to database names",
"#",
"# pg_restore will restore all the databases listed here, unless",
"# otherwise excluded. You can also inhibit restoration of a",
"# database by removing the line or commenting out the line with"
"# a # mark.",
"#################################################################",
NULL
};
snprintf(db_subdir, MAXPGPATH, "%s/databases", filename); snprintf(db_subdir, MAXPGPATH, "%s/databases", filename);
@ -2046,8 +2033,17 @@ dumpDatabases(PGconn *conn)
if (!map_file) if (!map_file)
pg_fatal("could not open file \"%s\": %m", map_file_path); pg_fatal("could not open file \"%s\": %m", map_file_path);
for (char **line = map_preamble; *line; line++) fprintf(map_file,
fprintf(map_file, "%s\n", *line); "#################################################################\n"
"# map.dat\n"
"#\n"
"# This file maps oids to database names\n"
"#\n"
"# pg_restore will restore all the databases listed here, unless\n"
"# otherwise excluded. You can also inhibit restoration of a\n"
"# database by removing the line or commenting out the line with\n"
"# a # mark.\n"
"#################################################################\n");
} }
for (i = 0; i < PQntuples(res); i++) for (i = 0; i < PQntuples(res); i++)