Commit4e46c97

committed

Fix NULL pointer dereference in tuplesort.c.

Oversight in commite94568e. This could cause a crash when an externaldatum tuplesort of a pass-by-value type required multiple passes.Per report from Mithun Cy.Peter GeogheganDiscussion:https://postgr.es/m/CAD__OujuhfWFULGFSt1fyHqUb8N-XafjJhudwt88V0Qs2o84qg@mail.gmail.com

1 parentfcf7086 commit4e46c97Copy full SHA for 4e46c97

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2800,7 +2800,8 @@ mergeonerun(Tuplesortstate *state)`
`2800`	`2800`	`WRITETUP(state,destTape,&state->memtuples[0]);`
`2801`	`2801`
`2802`	`2802`	`/* recycle the slot of the tuple we just wrote out, for the next read */`
`2803`		`-RELEASE_SLAB_SLOT(state,state->memtuples[0].tuple);`
	`2803`	`+if (state->memtuples[0].tuple)`
	`2804`	`+RELEASE_SLAB_SLOT(state,state->memtuples[0].tuple);`
`2804`	`2805`
`2805`	`2806`	`/*`
`2806`	`2807`	`* pull next tuple from the tape, and replace the written-out tuple in`

Comments

(0)