database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Specify the encoding of input to fmtId()

Browse Source 
This commit adds fmtIdEnc() and fmtQualifiedIdEnc(), which allow to specify
the encoding as an explicit argument.  Additionally setFmtEncoding() is
provided, which defines the encoding when no explicit encoding is provided, to
avoid breaking all code using fmtId().

All users of fmtId()/fmtQualifiedId() are either converted to the explicit
version or a call to setFmtEncoding() has been added.

This commit does not yet utilize the now well-defined encoding, that will
happen in a subsequent commit.

Reviewed-by: Noah Misch <noah@leadboat.com>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Backpatch-through: 13
Security: CVE-2025-1094
This commit is contained in:
Andres Freund
2025-02-10 10:03:39 -05:00
parent 703b3fd5de
commit b1756da754
13 changed files with 112 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/scripts/dropdb.c
View File

@ -129,13 +129,6 @@ main(int argc, char *argv[])
exit(0);
}
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "DROP DATABASE %s%s%s;",
(if_exists ? "IF EXISTS " : ""),
fmtId(dbname),
force ? " WITH (FORCE)" : "");
/* Avoid trying to drop postgres db while we are connected to it. */
if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
maintenance_db = "template1";
@ -149,6 +142,12 @@ main(int argc, char *argv[])
conn = connectMaintenanceDatabase(&cparams, progname, echo);
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "DROP DATABASE %s%s%s;",
(if_exists ? "IF EXISTS " : ""),
fmtIdEnc(dbname, PQclientEncoding(conn)),
force ? " WITH (FORCE)" : "");
if (echo)
printf("%s\n", sql.data);
result = PQexec(conn, sql.data);