Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4146925

Browse files
committed
Fix theoretical bug in tuplesort
This fixes a theoretical bug in tuplesort.c which, if a bounded sort was used in combination with a byval Datum sort (tuplesort_begin_datum), when switching the sort to a bounded heap in make_bounded_heap(), we'd call free_sort_tuple(). The problem was that when sorting Datums of a byval type, the tuple is NULL and free_sort_tuple() would free the memory for it regardless of that. This would result in a crash. Here we fix that simply by adding a check to see if the tuple is NULL before trying to disassociate and free any memory belonging to it. The reason this bug is only theoretical is that nowhere in the current code base do we do tuplesort_set_bound() when performing a Datum sort. However, let's backpatch a fix for this as if any extension uses the code in this way then it's likely to cause problems. Author: Ronan Dunklau Discussion: https://postgr.es/m/CAApHDvpdoqNC5FjDb3KUTSMs5dg6f+XxH4Bg_dVcLi8UYAG3EQ@mail.gmail.com Backpatch-through: 9.6, oldest supported version
1 parent 7c09d27 commit 4146925

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/backend/utils/sort/tuplesort.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -4773,6 +4773,9 @@ leader_takeover_tapes(Tuplesortstate *state)
47734773
static void
47744774
free_sort_tuple(Tuplesortstate *state, SortTuple *stup)
47754775
{
4776-
FREEMEM(state, GetMemoryChunkSpace(stup->tuple));
4777-
pfree(stup->tuple);
4776+
if (stup->tuple)
4777+
{
4778+
FREEMEM(state, GetMemoryChunkSpace(stup->tuple));
4779+
pfree(stup->tuple);
4780+
}
47784781
}

0 commit comments

Comments
 (0)