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 | 52a676ef4fc85f7e81bf0957d36aea53c0bfd230 (patch) | |
| tree | 32a07812898d5161aaebfcdd9df11a53e6c01f66 | |
| parent | d3946c4f622fce5295b349ef185b06a004a8df6b (diff) | |
| download | postgresql-52a676ef4fc85f7e81bf0957d36aea53c0bfd230.tar.gz postgresql-52a676ef4fc85f7e81bf0957d36aea53c0bfd230.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
| -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 e7cd6264db2..31a2e38260a 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); |