Prevent leaking tuples from tuplesort.

Alexander Korotkov · Alexander Korotkov · commit a63521e0e3cd · 2016-05-17T17:03:09.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -2257,6 +2257,7 @@ insertScanItem(RumScanOpaque so, bool recheck)
 		j++;
 	}
 	rum_tuplesort_putrum(so->sortstate, item);
+	pfree(item);
 }
 
 bool
diff --git a/rumscan.c b/rumscan.c
@@ -303,7 +303,10 @@ freeScanKeys(RumScanOpaque so)
 	}
 
 	pfree(so->entries);
+	if (so->sortedEntries)
+		pfree(so->sortedEntries);
 	so->entries = NULL;
+	so->sortedEntries = NULL;
 	so->totalentries = 0;
 }
 
@@ -415,6 +418,7 @@ rumNewScanKey(IndexScanDesc scan)
 	so->allocentries = 32;
 	so->entries = (RumScanEntry *)
 		palloc0(so->allocentries * sizeof(RumScanEntry));
+	so->sortedEntries = NULL;
 
 	so->isVoidRes = false;
 
diff --git a/rumsort.c b/rumsort.c
@@ -1536,12 +1536,15 @@ rum_tuplesort_putrum(Tuplesortstate *state, RumSortItem *item)
 {
 	MemoryContext oldcontext = MemoryContextSwitchTo(state->sortcontext);
 	SortTuple	stup;
+	RumSortItem *itemCopy = palloc(RumSortItemSize(state->nKeys));
+
+	memcpy(itemCopy, item, RumSortItemSize(state->nKeys));
 
 	/*
 	 * Copy the given tuple into memory we control, and decrease availMem.
 	 * Then call the common code.
 	 */
-	COPYTUP(state, &stup, (void *) item);
+	COPYTUP(state, &stup, (void *) itemCopy);
 
 	puttuple_common(state, &stup);
 

Original file line number	Diff line number	Diff line change
`@@ -2257,6 +2257,7 @@ insertScanItem(RumScanOpaque so, bool recheck)`
`2257`	`2257`	`j++;`
`2258`	`2258`	`}`
`2259`	`2259`	`rum_tuplesort_putrum(so->sortstate, item);`
	`2260`	`+ pfree(item);`
`2260`	`2261`	`}`
`2261`	`2262`
`2262`	`2263`	`bool`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,10 @@ freeScanKeys(RumScanOpaque so)`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`pfree(so->entries);`
	`306`	`+ if (so->sortedEntries)`
	`307`	`+ pfree(so->sortedEntries);`
`306`	`308`	`so->entries = NULL;`
	`309`	`+ so->sortedEntries = NULL;`
`307`	`310`	`so->totalentries = 0;`
`308`	`311`	`}`
`309`	`312`
`@@ -415,6 +418,7 @@ rumNewScanKey(IndexScanDesc scan)`
`415`	`418`	`so->allocentries = 32;`
`416`	`419`	`so->entries = (RumScanEntry *)`
`417`	`420`	`palloc0(so->allocentries * sizeof(RumScanEntry));`
	`421`	`+ so->sortedEntries = NULL;`
`418`	`422`
`419`	`423`	`so->isVoidRes = false;`
`420`	`424`