Skip to content

Commit 61ad93c

Browse files
anarazelanarazel
committed
Specify the encoding of input to fmtId()
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
1 parent 7d43ca6 commit 61ad93c

File tree

13 files changed

+115
-24
lines changed

13 files changed

+115
-24
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,6 +2818,7 @@ processEncodingEntry(ArchiveHandle *AH, TocEntry *te)
28182818
pg_fatal("unrecognized encoding \"%s\"",
28192819
ptr1);
28202820
AH->public.encoding = encoding;
2821+
setFmtEncoding(encoding);
28212822
}
28222823
else
28232824
pg_fatal("invalid ENCODING item: %s",

‎src/bin/pg_dump/pg_dump.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,7 @@ setup_connection(Archive *AH, const char *dumpencoding,
12111211
* we know how to escape strings.
12121212
*/
12131213
AH->encoding = PQclientEncoding(conn);
1214+
setFmtEncoding(AH->encoding);
12141215

12151216
std_strings = PQparameterStatus(conn, "standard_conforming_strings");
12161217
AH->std_strings = (std_strings && strcmp(std_strings, "on") == 0);

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ main(int argc, char *argv[])
524524
* we know how to escape strings.
525525
*/
526526
encoding = PQclientEncoding(conn);
527+
setFmtEncoding(encoding);
527528
std_strings = PQparameterStatus(conn, "standard_conforming_strings");
528529
if (!std_strings)
529530
std_strings = "off";

‎src/bin/psql/command.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,6 +1336,7 @@ exec_command_encoding(PsqlScanState scan_state, bool active_branch)
13361336
/* save encoding info into psql internal data */
13371337
pset.encoding = PQclientEncoding(pset.db);
13381338
pset.popt.topt.encoding = pset.encoding;
1339+
setFmtEncoding(pset.encoding);
13391340
SetVariable(pset.vars, "ENCODING",
13401341
pg_encoding_to_char(pset.encoding));
13411342
}
@@ -3956,6 +3957,8 @@ SyncVariables(void)
39563957
pset.popt.topt.encoding = pset.encoding;
39573958
pset.sversion = PQserverVersion(pset.db);
39583959

3960+
setFmtEncoding(pset.encoding);
3961+
39593962
SetVariable(pset.vars, "DBNAME", PQdb(pset.db));
39603963
SetVariable(pset.vars, "USER", PQuser(pset.db));
39613964
SetVariable(pset.vars, "HOST", PQhost(pset.db));

‎src/bin/scripts/common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ appendQualifiedRelation(PQExpBuffer buf, const char *spec,
112112
exit(1);
113113
}
114114
appendPQExpBufferStr(buf,
115-
fmtQualifiedId(PQgetvalue(res, 0, 1),
116-
PQgetvalue(res, 0, 0)));
115+
fmtQualifiedIdEnc(PQgetvalue(res, 0, 1),
116+
PQgetvalue(res, 0, 0),
117+
PQclientEncoding(conn)));
117118
appendPQExpBufferStr(buf, columns);
118119
PQclear(res);
119120
termPQExpBuffer(&sql);

‎src/bin/scripts/createdb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ main(int argc, char *argv[])
198198

199199
conn = connectMaintenanceDatabase(&cparams, progname, echo);
200200

201+
setFmtEncoding(PQclientEncoding(conn));
202+
201203
initPQExpBuffer(&sql);
202204

203205
appendPQExpBuffer(&sql, "CREATE DATABASE %s",

‎src/bin/scripts/createuser.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ main(int argc, char *argv[])
292292

293293
conn = connectMaintenanceDatabase(&cparams, progname, echo);
294294

295+
setFmtEncoding(PQclientEncoding(conn));
296+
295297
initPQExpBuffer(&sql);
296298

297299
printfPQExpBuffer(&sql, "CREATE ROLE %s", fmtId(newuser));

‎src/bin/scripts/dropdb.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ main(int argc, char *argv[])
129129
exit(0);
130130
}
131131

132-
initPQExpBuffer(&sql);
133-
134-
appendPQExpBuffer(&sql, "DROP DATABASE %s%s%s;",
135-
(if_exists ? "IF EXISTS " : ""),
136-
fmtId(dbname),
137-
force ? " WITH (FORCE)" : "");
138-
139132
/* Avoid trying to drop postgres db while we are connected to it. */
140133
if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
141134
maintenance_db = "template1";
@@ -149,6 +142,12 @@ main(int argc, char *argv[])
149142

150143
conn = connectMaintenanceDatabase(&cparams, progname, echo);
151144

145+
initPQExpBuffer(&sql);
146+
appendPQExpBuffer(&sql, "DROP DATABASE %s%s%s;",
147+
(if_exists ? "IF EXISTS " : ""),
148+
fmtIdEnc(dbname, PQclientEncoding(conn)),
149+
force ? " WITH (FORCE)" : "");
150+
152151
if (echo)
153152
printf("%s\n", sql.data);
154153
result = PQexec(conn, sql.data);

‎src/bin/scripts/dropuser.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ main(int argc, char *argv[])
143143

144144
initPQExpBuffer(&sql);
145145
appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
146-
(if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
146+
(if_exists ? "IF EXISTS " : ""),
147+
fmtIdEnc(dropuser, PQclientEncoding(conn)));
147148

148149
if (echo)
149150
printf("%s\n", sql.data);

‎src/bin/scripts/reindexdb.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ run_reindex_command(PGconn *conn, ReindexType type, const char *name,
512512

513513
if (tablespace)
514514
{
515-
appendPQExpBuffer(&sql, "%sTABLESPACE %s", sep, fmtId(tablespace));
515+
appendPQExpBuffer(&sql, "%sTABLESPACE %s", sep,
516+
fmtIdEnc(tablespace, PQclientEncoding(conn)));
516517
sep = comma;
517518
}
518519

@@ -552,7 +553,8 @@ run_reindex_command(PGconn *conn, ReindexType type, const char *name,
552553
{
553554
case REINDEX_DATABASE:
554555
case REINDEX_SYSTEM:
555-
appendPQExpBufferStr(&sql, fmtId(name));
556+
appendPQExpBufferStr(&sql,
557+
fmtIdEnc(name, PQclientEncoding(conn)));
556558
break;
557559
case REINDEX_INDEX:
558560
case REINDEX_TABLE:
@@ -775,8 +777,9 @@ get_parallel_object_list(PGconn *conn, ReindexType type,
775777
for (i = 0; i < ntups; i++)
776778
{
777779
appendPQExpBufferStr(&buf,
778-
fmtQualifiedId(PQgetvalue(res, i, 1),
779-
PQgetvalue(res, i, 0)));
780+
fmtQualifiedIdEnc(PQgetvalue(res, i, 1),
781+
PQgetvalue(res, i, 0),
782+
PQclientEncoding(conn)));
780783

781784
simple_string_list_append(tables, buf.data);
782785
resetPQExpBuffer(&buf);
@@ -788,8 +791,9 @@ get_parallel_object_list(PGconn *conn, ReindexType type,
788791
* the order of tables list.
789792
*/
790793
appendPQExpBufferStr(&buf,
791-
fmtQualifiedId(PQgetvalue(res, i, 1),
792-
PQgetvalue(res, i, 2)));
794+
fmtQualifiedIdEnc(PQgetvalue(res, i, 1),
795+
PQgetvalue(res, i, 2),
796+
PQclientEncoding(conn)));
793797

794798
simple_string_list_append(user_list, buf.data);
795799
resetPQExpBuffer(&buf);

0 commit comments

Comments
 (0)