Commit1605f9e

Maxim Orlov

committed

Fix valgrind errors when work_mem < 1 MB

- fix write uninited values in logical tape- fix double free

1 parentf608c36 commit1605f9eCopy full SHA for 1605f9e

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ scanPostingTree(Relation index, RumScanEntry scanEntry,`
`252`	`252`	`RumScanItemitem;`
`253`	`253`	`Pointerptr;`
`254`	`254`
	`255`	`+MemSet(&item,0,sizeof(item));`
`255`	`256`	`ItemPointerSetMin(&item.item.iptr);`
`256`	`257`
`257`	`258`	`ptr=RumDataPageGetData(page);`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,8 @@ copytup_rumitem(RumTuplesortstate * state, SortTuple stup, void tup)`
`202`	`202`	`#defineLogicalTapeReadExact_compat(state,LT_ARG,args...) LogicalTapeReadExact(state->tapeset, LT_ARG, ##args)`
`203`	`203`	`#endif`
`204`	`204`
`205`		`-staticsize_trum_item_size(RumTuplesortstate*state)`
	`205`	`+staticSize`
	`206`	`+rum_item_size(RumTuplesortstate*state)`
`206`	`207`	`{`
`207`	`208`	`if (state->copytup==copytup_rum)`
`208`	`209`	`returnRumSortItemSize(state->nKeys);`
`@@ -226,9 +227,6 @@ writetup_rum_internal(RumTuplesortstate * state, LT_TYPE LT_ARG, SortTuple *stup`
`226`	`227`	`if (state->randomAccess)/* need trailing length word? */`
`227`	`228`	`LogicalTapeWrite(TAPE(state,LT_ARG),`
`228`	`229`	`(void*)&writtenlen,sizeof(writtenlen));`
`229`		`-`
`230`		`-FREEMEM(state,GetMemoryChunkSpace(item));`
`231`		`-pfree(item);`
`232`	`230`	`}`
`233`	`231`
`234`	`232`	`staticvoid`
`@@ -251,7 +249,7 @@ readtup_rum_internal(RumTuplesortstate * state, SortTuple *stup,`
`251`	`249`	`size_tsize=rum_item_size(state);`
`252`	`250`	`void*item=palloc(size);`
`253`	`251`
`254`		`-Assert(tuplen==RumSortItemSize(state->nKeys));`
	`252`	`+Assert(tuplen==size);`
`255`	`253`
`256`	`254`	`USEMEM(state,GetMemoryChunkSpace(item));`
`257`	`255`	`LogicalTapeReadExact_compat(state,LT_ARG,item,size);`

Comments

(0)