NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commite13ac55

committed

Avoid possible crash in contrib/bloom's blendscan().

It's possible to begin and end an indexscan without ever callingamrescan. contrib/bloom, unlike every other index AM, allocatedits "scan->opaque" storage at amrescan time, and thus would crashin amendscan if amrescan hadn't been called. We could fix thisby putting in a null-pointer check in blendscan, but I see no verygood reason why contrib/bloom should march to its own drummer inthis respect. Let's move that initialization to blbeginscaninstead. Per report from Jeff Janes.

1 parent7c979c9 commite13ac55Copy full SHA for e13ac55

File tree

1 file changed

+10

-16

lines changed

contrib/bloom
- blscan.c

1 file changed

+10

-16

lines changed

`‎contrib/bloom/blscan.c`

Lines changed: 10 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,16 @@ IndexScanDesc`
`29`	`29`	`blbeginscan(Relationr,intnkeys,intnorderbys)`
`30`	`30`	`{`
`31`	`31`	`IndexScanDescscan;`
	`32`	`+BloomScanOpaqueso;`
`32`	`33`
`33`	`34`	`scan=RelationGetIndexScan(r,nkeys,norderbys);`
`34`	`35`
	`36`	`+so= (BloomScanOpaque)palloc(sizeof(BloomScanOpaqueData));`
	`37`	`+initBloomState(&so->state,scan->indexRelation);`
	`38`	`+so->sign=NULL;`
	`39`	`+`
	`40`	`+scan->opaque=so;`
	`41`	`+`
`35`	`42`	`returnscan;`
`36`	`43`	`}`
`37`	`44`
`@@ -42,23 +49,10 @@ void`
`42`	`49`	`blrescan(IndexScanDescscan,ScanKeyscankey,intnscankeys,`
`43`	`50`	`ScanKeyorderbys,intnorderbys)`
`44`	`51`	`{`
`45`		`-BloomScanOpaqueso;`
`46`		`-`
`47`		`-so= (BloomScanOpaque)scan->opaque;`
`48`		`-`
`49`		`-if (so==NULL)`
`50`		`-{`
`51`		`-/* if called from blbeginscan */`
`52`		`-so= (BloomScanOpaque)palloc(sizeof(BloomScanOpaqueData));`
`53`		`-initBloomState(&so->state,scan->indexRelation);`
`54`		`-scan->opaque=so;`
	`52`	`+BloomScanOpaqueso= (BloomScanOpaque)scan->opaque;`
`55`	`53`
`56`		`-}`
`57`		`-else`
`58`		`-{`
`59`		`-if (so->sign)`
`60`		`-pfree(so->sign);`
`61`		`-}`
	`54`	`+if (so->sign)`
	`55`	`+pfree(so->sign);`
`62`	`56`	`so->sign=NULL;`
`63`	`57`
`64`	`58`	`if (scankey&&scan->numberOfKeys>0)`

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!

Commite13ac55

File tree

1 file changed

1 file changed

`‎contrib/bloom/blscan.c`

0 commit comments