Make escaping functions retain trailing bytes of an invalid character.
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 15 Feb 2025 21:20:21 +0000 (16:20 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 15 Feb 2025 21:20:21 +0000 (16:20 -0500)
commite782a63ccb76a8db476abb8f5d96397806e3e51b
tree6e9f3ef134d26aa2cf8f745169289a500671ed94
parent22ffbbf24db4e5996abcf376ef1735346d4b6f75
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: http://postgr.es/m/20250215012712.45@rfd.leadboat.com
Backpatch-through: 13
src/fe_utils/string_utils.c
src/interfaces/libpq/fe-exec.c