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
This commit is contained in:
parent
87b7a652b3
commit
d0e44bae49
@ -4775,6 +4775,7 @@ writetup_datum(Tuplesortstate *state, int tapenum, SortTuple *stup)
|
|||||||
{
|
{
|
||||||
FREEMEM(state, GetMemoryChunkSpace(stup->tuple));
|
FREEMEM(state, GetMemoryChunkSpace(stup->tuple));
|
||||||
pfree(stup->tuple);
|
pfree(stup->tuple);
|
||||||
|
stup->tuple = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user