Skip to content

Commit 1679a88

Browse files
tglsfdcpull[bot]
authored andcommitted
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 da6f771 commit 1679a88

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
@@ -252,6 +252,8 @@ to_tsvector_byid(PG_FUNCTION_ARGS)
252252
* number */
253253
if (prs.lenwords < 2)
254254
prs.lenwords = 2;
255+
else if (prs.lenwords > MaxAllocSize / sizeof(ParsedWord))
256+
prs.lenwords = MaxAllocSize / sizeof(ParsedWord);
255257
prs.curwords = 0;
256258
prs.pos = 0;
257259
prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords);

0 commit comments

Comments
 (0)