diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2023-09-25 11:50:28 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2023-09-25 11:50:28 -0400 |
| commit | 4a81ed29d3c956ad11354c0dc4514f5af4a0d8d7 (patch) | |
| tree | 2cdbb4e1f18ba373c4dcaf17f7183efb5d1033c3 /src | |
| parent | af9f6cd1ddfa2bbc62c853f365fcf12d93bcde92 (diff) | |
| download | postgresql-4a81ed29d3c956ad11354c0dc4514f5af4a0d8d7.tar.gz postgresql-4a81ed29d3c956ad11354c0dc4514f5af4a0d8d7.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tsearch/to_tsany.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 6baee8e1558..d9619c576e7 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -242,6 +242,8 @@ to_tsvector_byid(PG_FUNCTION_ARGS) * number */ if (prs.lenwords < 2) prs.lenwords = 2; + else if (prs.lenwords > MaxAllocSize / sizeof(ParsedWord)) + prs.lenwords = MaxAllocSize / sizeof(ParsedWord); prs.curwords = 0; prs.pos = 0; prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords); |