Fix overflows with ts_headline()

The options "StartSel", "StopSel" and "FragmentDelimiter" given by a
caller of the SQL function ts_headline() have their lengths stored as
int16.  When providing values larger than PG_INT16_MAX, it was possible
to overflow the length values stored, leading to incorrect behaviors in
generateHeadline(), in most cases translating to a crash.

Attempting to use values for these options larger than PG_INT16_MAX is
now blocked.  Some test cases are added to cover our tracks.

Reported-by: Xint Code
Author: Michael Paquier <michael@paquier.xyz>
Backpatch-through: 14
Security: CVE-2026-6473

diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index 8b9b34e762a8cb03e093cb1cf80bfc64bbe55e2b..480915030df71013de7b545ae3f8af7f00ab788f 100644 (file)
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -2583,6 +2583,9 @@ prsd_headline(PG_FUNCTION_ARGS)
        int                     max_fragments = 0;
        bool            highlightall = false;
        ListCell   *l;
+       size_t          startsellen;
+       size_t          stopsellen;
+       size_t          fragdelimlen;
 
        /* Extract configuration option values */
        prs->startsel = NULL;
@@ -2672,9 +2675,24 @@ prsd_headline(PG_FUNCTION_ARGS)
                prs->fragdelim = pstrdup(" ... ");
 
        /* Caller will need these lengths, too */
-       prs->startsellen = strlen(prs->startsel);
-       prs->stopsellen = strlen(prs->stopsel);
-       prs->fragdelimlen = strlen(prs->fragdelim);
+       startsellen = strlen(prs->startsel);
+       stopsellen = strlen(prs->stopsel);
+       fragdelimlen = strlen(prs->fragdelim);
+       if (startsellen > PG_INT16_MAX)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                errmsg("value for \"%s\" is too long", "StartSel")));
+       if (stopsellen > PG_INT16_MAX)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                errmsg("value for \"%s\" is too long", "StopSel")));
+       if (fragdelimlen > PG_INT16_MAX)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                errmsg("value for \"%s\" is too long", "FragmentDelimiter")));
+       prs->startsellen = startsellen;
+       prs->stopsellen = stopsellen;
+       prs->fragdelimlen = fragdelimlen;
 
        PG_RETURN_POINTER(prs);
 }

diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
index 9287c440709f49b57ab0e73e8e0c8ad427f86d1f..5b7c2123f373ed49514c43c942917ac6ed288e04 100644 (file)
--- a/src/test/regress/expected/tsearch.out
+++ b/src/test/regress/expected/tsearch.out
@@ -2145,6 +2145,16 @@ NOTICE:  text-search query doesn't contain lexemes: ""
  foo bar
 (1 row)
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+ERROR:  value for "StartSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+ERROR:  value for "StopSel" is too long
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+ERROR:  value for "FragmentDelimiter" is too long
 --Rewrite sub system
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
 \set ECHO none

diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
index dc74aa0c889b375e157f413bc2d0a40bbdd3ef1f..8b3d700f57cdb098788202940cc12cfc26a4e997 100644 (file)
--- a/src/test/regress/sql/tsearch.sql
+++ b/src/test/regress/sql/tsearch.sql
@@ -647,6 +647,14 @@ SELECT ts_headline('english',
 SELECT ts_headline('english',
 'foo bar', to_tsquery('english', ''));
 
+-- Test for large values of StartSel, StopSel and FragmentDelimiter
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StartSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'StopSel=' || repeat('x', 32768));
+SELECT ts_headline('english', 'foo barbar', to_tsquery('english', 'foo'),
+  'FragmentDelimiter=' || repeat('x', 32768));
+
 --Rewrite sub system
 
 CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);