Fix unsafe coding in ReorderBufferCommit().

tglsfdc · tglsfdc · commit f8a4dd2e141a · 2015-01-24T13:25:19.000-05:00
"iterstate" must be marked volatile since it's changed inside the PG_TRY
block and then used in the PG_CATCH stanza.  Noted by Mark Wilding of
Salesforce.  (We really need to see if we can't get the C compiler to warn
about this.)

Also, reset iterstate to NULL after the mainline ReorderBufferIterTXNFinish
call, to ensure the PG_CATCH block doesn't try to do that a second time.
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -1258,7 +1258,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 					TimestampTz commit_time)
 {
 	ReorderBufferTXN *txn;
-	ReorderBufferIterTXNState *iterstate = NULL;
+	ReorderBufferIterTXNState *volatile iterstate = NULL;
 	ReorderBufferChange *change;
 
 	volatile CommandId command_id = FirstCommandId;
@@ -1303,7 +1303,6 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 
 	PG_TRY();
 	{
-
 		/*
 		 * Decoding needs access to syscaches et al., which in turn use
 		 * heavyweight locks and such. Thus we need to have enough state
@@ -1472,7 +1471,9 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 			}
 		}
 
+		/* clean up the iterator */
 		ReorderBufferIterTXNFinish(rb, iterstate);
+		iterstate = NULL;
 
 		/* call commit callback */
 		rb->commit(rb, txn, commit_lsn);
@@ -1639,7 +1640,7 @@ ReorderBufferForget(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn)
 	 */
 	if (txn->base_snapshot != NULL && txn->ninvalidations > 0)
 	{
-		bool use_subtxn = IsTransactionOrTransactionBlock();
+		bool		use_subtxn = IsTransactionOrTransactionBlock();
 
 		if (use_subtxn)
 			BeginInternalSubTransaction("replay");

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