NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit15ea57c

Artur Zakirov

committed

Fix possible subtraction overflow

1 parent88b6bc4 commit15ea57cCopy full SHA for 15ea57c

File tree

2 files changed

+19

-8

lines changed

2 files changed

+19

-8

lines changed

`‎rumdatapage.c`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,8 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)`
`732`	`732`	`*/`
`733`	`733`	`findInLeafPage(btree,page,&off,&iptr,&ptr);`
`734`	`734`
`735`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`735`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`736`	`+Assert(freespace >=0);`
`736`	`737`
`737`	`738`	`if (off <=maxoff)`
`738`	`739`	`{`
`@@ -768,7 +769,8 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)`
`768`	`769`	`ptr=rumPlaceToDataPageLeaf(ptr,btree->entryAttnum,`
`769`	`770`	`&btree->items[j],btree->addInfo[j],btree->addInfoIsNull[j],`
`770`	`771`	`&iptr,btree->rumstate);`
`771`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`772`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`773`	`+Assert(freespace >=0);`
`772`	`774`
`773`	`775`	`iptr=btree->items[j];`
`774`	`776`	`btree->curitem++;`
`@@ -785,7 +787,10 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)`
`785`	`787`	`ptr=rumPlaceToDataPageLeaf(ptr,btree->entryAttnum,`
`786`	`788`	`&copy_iptr,addInfo,addInfoIsNull,`
`787`	`789`	`&iptr,btree->rumstate);`
`788`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`790`	`+`
	`791`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`792`	`+Assert(freespace >=0);`
	`793`	`+`
`789`	`794`	`iptr=copy_iptr;`
`790`	`795`	`}`
`791`	`796`	`}`
`@@ -851,6 +856,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,`
`851`	`856`	`ItemPointerDataiptr,prevIptr,maxLeftIptr;`
`852`	`857`	`inttotalCount=0;`
`853`	`858`	`intmaxItemIndex=btree->curitem;`
	`859`	`+intfreespace;`
`854`	`860`
`855`	`861`	`staticcharlpageCopy[BLCKSZ];`
`856`	`862`
`@@ -970,7 +976,8 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,`
`970`	`976`	`btree->addInfo[btree->curitem],`
`971`	`977`	`btree->addInfoIsNull[btree->curitem],`
`972`	`978`	`&prevIptr,btree->rumstate);`
`973`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`979`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`980`	`+Assert(freespace >=0);`
`974`	`981`
`975`	`982`	`prevIptr=btree->items[btree->curitem];`
`976`	`983`	`btree->curitem++;`
`@@ -984,7 +991,8 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,`
`984`	`991`
`985`	`992`	`ptr=rumPlaceToDataPageLeaf(ptr,btree->entryAttnum,&iptr,`
`986`	`993`	`addInfo,addInfoIsNull,&prevIptr,btree->rumstate);`
`987`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`994`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`995`	`+Assert(freespace >=0);`
`988`	`996`
`989`	`997`	`prevIptr=iptr;`
`990`	`998`
`@@ -1000,7 +1008,8 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,`
`1000`	`1008`	`btree->addInfo[btree->curitem],`
`1001`	`1009`	`btree->addInfoIsNull[btree->curitem],`
`1002`	`1010`	`&prevIptr,btree->rumstate);`
`1003`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`1011`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`1012`	`+Assert(freespace >=0);`
`1004`	`1013`
`1005`	`1014`	`prevIptr=btree->items[btree->curitem];`
`1006`	`1015`	`btree->curitem++;`

`‎ruminsert.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ createPostingTree(RumState *rumstate, OffsetNumber attnum, Relation index,`
`44`	`44`	`BlockNumberblkno;`
`45`	`45`	`Bufferbuffer=RumNewBuffer(index);`
`46`	`46`	`Pagepage;`
`47`		`-inti;`
	`47`	`+inti,`
	`48`	`+freespace;`
`48`	`49`	`Pointerptr;`
`49`	`50`	`ItemPointerDataprev_iptr= {{0,0},0};`
`50`	`51`	`GenericXLogState*state;`
`@@ -65,7 +66,8 @@ createPostingTree(RumState *rumstate, OffsetNumber attnum, Relation index,`
`65`	`66`	`ptr=rumPlaceToDataPageLeaf(ptr,attnum,&items[i],addInfo[i],`
`66`	`67`	`addInfoIsNull[i],&prev_iptr,rumstate);`
`67`	`68`	`}`
`68`		`-Assert(RumDataPageFreeSpacePre(page,ptr) >=0);`
	`69`	`+freespace=RumDataPageFreeSpacePre(page,ptr);`
	`70`	`+Assert(freespace >=0);`
`69`	`71`	`updateItemIndexes(page,attnum,rumstate);`
`70`	`72`
`71`	`73`	`GenericXLogFinish(state);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit15ea57c

File tree

2 files changed

2 files changed

`‎rumdatapage.c`

`‎ruminsert.c`

0 commit comments