NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit91964c3

committed

Fix unsafe coding in ReorderBufferCommit().

"iterstate" must be marked volatile since it's changed inside the PG_TRYblock and then used in the PG_CATCH stanza. Noted by Mark Wilding ofSalesforce. (We really need to see if we can't get the C compiler to warnabout this.)Also, reset iterstate to NULL after the mainline ReorderBufferIterTXNFinishcall, to ensure the PG_CATCH block doesn't try to do that a second time.

1 parentd51d4ff commit91964c3Copy full SHA for 91964c3

File tree

1 file changed

-3

lines changed

src/backend/replication/logical
- reorderbuffer.c

1 file changed

-3

lines changed

`‎src/backend/replication/logical/reorderbuffer.c`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,`
`1259`	`1259`	`TimestampTzcommit_time)`
`1260`	`1260`	`{`
`1261`	`1261`	`ReorderBufferTXN*txn;`
`1262`		`-ReorderBufferIterTXNState*iterstate=NULL;`
	`1262`	`+ReorderBufferIterTXNState*volatileiterstate=NULL;`
`1263`	`1263`	`ReorderBufferChange*change;`
`1264`	`1264`
`1265`	`1265`	`volatileCommandIdcommand_id=FirstCommandId;`
`@@ -1304,7 +1304,6 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,`
`1304`	`1304`
`1305`	`1305`	`PG_TRY();`
`1306`	`1306`	`{`
`1307`		`-`
`1308`	`1307`	`/*`
`1309`	`1308`	`* Decoding needs access to syscaches et al., which in turn use`
`1310`	`1309`	`* heavyweight locks and such. Thus we need to have enough state`
`@@ -1473,7 +1472,9 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,`
`1473`	`1472`	`}`
`1474`	`1473`	`}`
`1475`	`1474`
	`1475`	`+/* clean up the iterator */`
`1476`	`1476`	`ReorderBufferIterTXNFinish(rb,iterstate);`
	`1477`	`+iterstate=NULL;`
`1477`	`1478`
`1478`	`1479`	`/* call commit callback */`
`1479`	`1480`	`rb->commit(rb,txn,commit_lsn);`
`@@ -1640,7 +1641,7 @@ ReorderBufferForget(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn)`
`1640`	`1641`	`*/`
`1641`	`1642`	`if (txn->base_snapshot!=NULL&&txn->ninvalidations>0)`
`1642`	`1643`	`{`
`1643`		`-booluse_subtxn=IsTransactionOrTransactionBlock();`
	`1644`	`+booluse_subtxn=IsTransactionOrTransactionBlock();`
`1644`	`1645`
`1645`	`1646`	`if (use_subtxn)`
`1646`	`1647`	`BeginInternalSubTransaction("replay");`

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!

Commit91964c3

File tree

1 file changed

1 file changed

`‎src/backend/replication/logical/reorderbuffer.c`

0 commit comments