NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commitdae00f3

committed

aio: Improve assertions related to io_method

First, the assertions in assign_io_method() were the wrong way round. Second,the lengthof() assertion checked the length of io_method_options, which is thewrong array to check and is always longer than pgaio_method_ops_table.While add it, add a static assert to ensure pgaio_method_ops_table andio_method_options stay in sync.Per coverity and Tom Lane.Reported-by: Tom Lane <tgl@sss.pgh.pa.us>Backpatch-through: 18

1 parent2d83d72 commitdae00f3Copy full SHA for dae00f3

File tree

1 file changed

-1

lines changed

src/backend/storage/aio
- aio.c

1 file changed

-1

lines changed

`‎src/backend/storage/aio/aio.c‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ static const IoMethodOps *const pgaio_method_ops_table[] = {`
`89`	`89`	`#endif`
`90`	`90`	`};`
`91`	`91`
	`92`	`+StaticAssertDecl(lengthof(io_method_options)==lengthof(pgaio_method_ops_table)+1,`
	`93`	`+"io_method_options out of sync with pgaio_method_ops_table");`
	`94`	`+`
`92`	`95`	`/* callbacks for the configured io_method, set by assign_io_method */`
`93`	`96`	`constIoMethodOps*pgaio_method_ops;`
`94`	`97`
`@@ -1318,8 +1321,8 @@ pgaio_shutdown(int code, Datum arg)`
`1318`	`1321`	`void`
`1319`	`1322`	`assign_io_method(intnewval,void*extra)`
`1320`	`1323`	`{`
	`1324`	`+Assert(newval<lengthof(pgaio_method_ops_table));`
`1321`	`1325`	`Assert(pgaio_method_ops_table[newval]!=NULL);`
`1322`		`-Assert(newval<lengthof(io_method_options));`
`1323`	`1326`
`1324`	`1327`	`pgaio_method_ops=pgaio_method_ops_table[newval];`
`1325`	`1328`	`}`

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!

Commitdae00f3

File tree

1 file changed

1 file changed

`‎src/backend/storage/aio/aio.c‎`

0 commit comments