diff options
| author | Fujii Masao <fujii@postgresql.org> | 2021-01-15 12:44:17 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2021-01-15 12:45:25 +0900 |
| commit | 60369db86f6cc9432626df5a5ccdd9eb3338798e (patch) | |
| tree | d5e3188aa75e2f1285c44510d4ad58077faff353 /src | |
| parent | 79d3ac72f690b45e2b278be746f858a1f6311310 (diff) | |
| download | postgresql-60369db86f6cc9432626df5a5ccdd9eb3338798e.tar.gz postgresql-60369db86f6cc9432626df5a5ccdd9eb3338798e.zip | |
Fix calculation of how much shared memory is required to store a TOC.
Commit ac883ac453 refactored shm_toc_estimate() but changed its calculation
of shared memory size for TOC incorrectly. Previously this could cause too
large memory to be allocated.
Back-patch to v11 where the bug was introduced.
Author: Takayuki Tsunakawa
Discussion: https://postgr.es/m/TYAPR01MB2990BFB73170E2C4921E2C4DFEA80@TYAPR01MB2990.jpnprd01.prod.outlook.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/ipc/shm_toc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/ipc/shm_toc.c b/src/backend/storage/ipc/shm_toc.c index bdd72c48fb8..2d865fa4d8b 100644 --- a/src/backend/storage/ipc/shm_toc.c +++ b/src/backend/storage/ipc/shm_toc.c @@ -265,8 +265,8 @@ shm_toc_estimate(shm_toc_estimator *e) Size sz; sz = offsetof(shm_toc, toc_entry); - sz += add_size(sz, mul_size(e->number_of_keys, sizeof(shm_toc_entry))); - sz += add_size(sz, e->space_for_chunks); + sz = add_size(sz, mul_size(e->number_of_keys, sizeof(shm_toc_entry))); + sz = add_size(sz, e->space_for_chunks); return BUFFERALIGN(sz); } |