pgsql: Make escaping functions retain trailing bytes of an invalid char - Mailing list pgsql-committers

From Tom Lane
Subject pgsql: Make escaping functions retain trailing bytes of an invalid char
Date
Msg-id E1tjPaj-007JiE-0E@gemulon.postgresql.org
Whole thread Raw
List pgsql-committers
Make escaping functions retain trailing bytes of an invalid character.

Instead of dropping the trailing byte(s) of an invalid or incomplete
multibyte character, replace only the first byte with a known-invalid
sequence, and process the rest normally.  This seems less likely to
confuse incautious callers than the behavior adopted in 5dc1e42b4.

While we're at it, adjust PQescapeStringInternal to produce at most
one bleat about invalid multibyte characters per string.  This
matches the behavior of PQescapeInternal, and avoids the risk of
producing tons of repetitive junk if a long string is simply given
in the wrong encoding.

This is a followup to the fixes for CVE-2025-1094, and should be
included if cherry-picking those fixes.

Author: Andres Freund <andres@anarazel.de>
Co-authored-by: Tom Lane <tgl@sss.pgh.pa.us>
Reported-by: Jeff Davis <pgsql@j-davis.com>
Discussion: https://postgr.es/m/20250215012712.45@rfd.leadboat.com
Backpatch-through: 13

Branch
------
REL_13_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/d6d29b2133f1c2a7d4f332bf68b2f40c8de3044c

Modified Files
--------------
src/fe_utils/string_utils.c    | 91 ++++++++++++++++--------------------------
src/interfaces/libpq/fe-exec.c | 73 +++++++++++++++------------------
2 files changed, 67 insertions(+), 97 deletions(-)


pgsql-committers by date:

Previous
From: Thomas Munro
Date:
Subject: pgsql: Fix explicit valgrind interaction in read_stream.c.
Next
From: Tom Lane
Date:
Subject: pgsql: In fmtIdEnc(), handle failure of enlargePQExpBuffer().