Skip to content

Commit 4a81ed2

Browse files
committed
Limit to_tsvector_byid's initial array allocation to something sane.
The initial estimate of the number of distinct ParsedWords is just that: an estimate. Don't let it exceed what palloc is willing to allocate. If in fact we need more entries, we'll eventually fail trying to enlarge the array. But if we don't, this allows success on inputs that currently draw "invalid memory alloc request size". Per bug #18080 from Uwe Binder. Back-patch to all supported branches. Discussion: https://postgr.es/m/18080-d5c5e58fef8c99b7@postgresql.org
1 parent af9f6cd commit 4a81ed2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/backend/tsearch/to_tsany.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ to_tsvector_byid(PG_FUNCTION_ARGS)
242242
* number */
243243
if (prs.lenwords < 2)
244244
prs.lenwords = 2;
245+
else if (prs.lenwords > MaxAllocSize / sizeof(ParsedWord))
246+
prs.lenwords = MaxAllocSize / sizeof(ParsedWord);
245247
prs.curwords = 0;
246248
prs.pos = 0;
247249
prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords);

0 commit comments

Comments
 (0)