diff options
| author | David Rowley <drowley@postgresql.org> | 2021-07-13 13:27:05 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2021-07-13 13:27:05 +1200 |
| commit | 5bd38d2f2846c7e387d04a16c4372da0de7b1221 (patch) | |
| tree | 8779bde858f5ae24c3b5cc3d4793966fcba61145 /src | |
| parent | 41469253e970b539a4ae75226dd4f226b7b2bc8c (diff) | |
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
Diffstat (limited to 'src')
| -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 27069814de9..b17347b2141 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -4777,5 +4777,6 @@ free_sort_tuple(Tuplesortstate *state, SortTuple *stup) { FREEMEM(state, GetMemoryChunkSpace(stup->tuple)); pfree(stup->tuple); + stup->tuple = NULL; } } |