Replace pg_mblen() with bounds-checked versions.

Thomas Munro <tmunro@postgresql.org>

Commit: cecedb912aeea391332bcb307d8e089266dbb2be
Author: Thomas Munro <tmunro@postgresql.org>
Date: 2026-02-08T23:39:01Z
Releases: 14.21
Replace pg_mblen() with bounds-checked versions.

A corrupted string could cause code that iterates with pg_mblen() to
overrun its buffer.  Fix, by converting all callers to one of the
following:

1. Callers with a null-terminated string now use pg_mblen_cstr(), which
raises an "illegal byte sequence" error if it finds a terminator in the
middle of the sequence.

2. Callers with a length or end pointer now use either
pg_mblen_with_len() or pg_mblen_range(), for the same effect, depending
on which of the two seems more convenient at each site.

3. A small number of cases pre-validate a string, and can use
pg_mblen_unbounded().

The traditional pg_mblen() function and COPYCHAR macro still exist for
backward compatibility, but are no longer used by core code and are
hereby deprecated.  The same applies to the t_isXXX() functions.

Security: CVE-2026-2006
Backpatch-through: 14
Co-authored-by: Thomas Munro <thomas.munro@gmail.com>
Co-authored-by: Noah Misch <noah@leadboat.com>
Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Reported-by: Paul Gerste (as part of zeroday.cloud)
Reported-by: Moritz Sanft (as part of zeroday.cloud)

Files

PathChange+/−
contrib/btree_gist/btree_utils_var.c modified +16 −5
contrib/dict_xsyn/dict_xsyn.c modified +4 −4
contrib/hstore/hstore_io.c modified +4 −4
contrib/ltree/lquery_op.c modified +2 −2
contrib/ltree/ltree.h modified +2 −1
contrib/ltree/ltree_io.c modified +8 −8
contrib/ltree/ltxtquery_io.c modified +2 −2
contrib/pageinspect/heapfuncs.c modified +1 −1
contrib/pg_trgm/trgm.h modified +2 −2
contrib/pg_trgm/trgm_op.c modified +31 −17
contrib/pg_trgm/trgm_regexp.c modified +12 −9
contrib/unaccent/unaccent.c modified +4 −3
src/backend/catalog/pg_proc.c modified +1 −1
src/backend/tsearch/dict_synonym.c modified +4 −4
src/backend/tsearch/dict_thesaurus.c modified +9 −9
src/backend/tsearch/regis.c modified +16 −21
src/backend/tsearch/spell.c modified +58 −65
src/backend/tsearch/ts_locale.c modified +35 −62
src/backend/tsearch/ts_utils.c modified +2 −2
src/backend/tsearch/wparser_def.c modified +2 −1
src/backend/utils/adt/encode.c modified +5 −5
src/backend/utils/adt/formatting.c modified +12 −10
src/backend/utils/adt/jsonfuncs.c modified +1 −1
src/backend/utils/adt/jsonpath_gram.y modified +1 −1
src/backend/utils/adt/levenshtein.c modified +8 −6
src/backend/utils/adt/like.c modified +9 −9
src/backend/utils/adt/like_match.c modified +2 −1
src/backend/utils/adt/oracle_compat.c modified +21 −12
src/backend/utils/adt/regexp.c modified +4 −2
src/backend/utils/adt/tsquery.c modified +12 −13
src/backend/utils/adt/tsvector.c modified +6 −5
src/backend/utils/adt/tsvector_op.c modified +7 −3
src/backend/utils/adt/tsvector_parser.c modified +12 −17
src/backend/utils/adt/varbit.c modified +4 −4
src/backend/utils/adt/varlena.c modified +26 −15
src/backend/utils/adt/xml.c modified +5 −6
src/backend/utils/mb/mbutils.c modified +143 −7
src/include/mb/pg_wchar.h modified +7 −0
src/include/tsearch/ts_locale.h modified +29 −5
src/include/tsearch/ts_utils.h modified +6 −8
src/test/modules/test_regex/test_regex.c modified +2 −1