From: David Rowley Date: Tue, 13 Jul 2021 01:31:00 +0000 (+1200) Subject: Robustify tuplesort's free_sort_tuple function X-Git-Tag: REL_11_13~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eff751ea5fe173b8016ae7b6e1ab15190c2267be;p=thirdparty%2Fpostgresql.git 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 --- diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index d7f106dba57..60223929e52 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -4588,5 +4588,6 @@ free_sort_tuple(Tuplesortstate *state, SortTuple *stup) { FREEMEM(state, GetMemoryChunkSpace(stup->tuple)); pfree(stup->tuple); + stup->tuple = NULL; } }