diff options
| author | David Rowley <drowley@postgresql.org> | 2021-07-13 13:30:26 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2021-07-13 13:30:26 +1200 |
| commit | 645c5d11939641ce4ad14f7e547e9c5ec2b98f71 (patch) | |
| tree | b8243caf4d62ea71729d3ac178066a613436b313 | |
| parent | 6f1c7a2d0fe0a3cf4a46053f50d0931248ba6e73 (diff) | |
| download | postgresql-645c5d11939641ce4ad14f7e547e9c5ec2b98f71.tar.gz postgresql-645c5d11939641ce4ad14f7e547e9c5ec2b98f71.zip | |
Robustify tuplesort's free_sort_tuple function
41469253e went to the trouble of removing a theoretical bug from
free_sort_tuple by checking if the tuple was NULL before freeing it. Let's
make this a little more robust by also setting the tuple to NULL so that
should we be called again we won't end up doing a pfree on the already
pfree'd tuple. Per advice from Tom Lane.
Discussion: https://postgr.es/m/3188192.1626136953@sss.pgh.pa.us
Backpatch-through: 9.6, same as 41469253e
| -rw-r--r-- | src/backend/utils/sort/tuplesort.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 2b21888a015..f975d24a98c 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -4589,5 +4589,6 @@ free_sort_tuple(Tuplesortstate *state, SortTuple *stup) { FREEMEM(state, GetMemoryChunkSpace(stup->tuple)); pfree(stup->tuple); + stup->tuple = NULL; } } |