database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Tighten up tsqueryrecv().

Browse Source 
tsqueryrecv() accepted zero-length lexemes, which tsqueryin() doesn't.
It also accepted phrase distance values larger than MAXENTRYPOS,
which tsqueryin() doesn't.  While neither of these omissions are
very harmful in themselves, they do allow accepting tsquery values
that will fail in a subsequent textual dump/reload.

Commit 23d9ad771 performed similar tightening of tsvectorrecv(),
but I left off these changes at the time because they didn't seem
to have security implications.

Reported-by: Claude Code (via Noah Misch)
Author: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://postgr.es/m/455079.1786897319@sss.pgh.pa.us
Backpatch-through: 14
This commit is contained in:
Tom Lane
2026-08-17 18:09:07 -04:00
parent 9d2d3bd079
commit 05556bdf93
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/adt/tsquery.c
View File

@@ -1220,6 +1220,9 @@ tsqueryrecv(PG_FUNCTION_ARGS)
if (weight > 0xF)
elog(ERROR, "invalid tsquery: invalid weight bitmap");
if (val_len == 0)
elog(ERROR, "invalid tsquery: empty operand");
if (val_len > MAXSTRLEN)
elog(ERROR, "invalid tsquery: operand too long");
@@ -1259,7 +1262,14 @@ tsqueryrecv(PG_FUNCTION_ARGS)
item->qoperator.oper = oper;
if (oper == OP_PHRASE)
item->qoperator.distance = (int16) pq_getmsgint(buf, sizeof(int16));
{
unsigned int dist = pq_getmsgint(buf, sizeof(int16));
if (dist > MAXENTRYPOS)
elog(ERROR, "invalid tsquery: invalid phrase distance %u",
dist);
item->qoperator.distance = (int16) dist;
}
}
else
elog(ERROR, "unrecognized tsquery node type: %d", item->type);