NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2403e54

committed

Fix RelationIdGetRelation calls that weren't bothering with error checks.

Some of these are quite old, but that doesn't make them not bugs.We'd rather report a failure via elog than SIGSEGV.While at it, uniformly spell the error check as !RelationIsValid(rel)rather than a bare rel == NULL test. The machine code is the samebut it seems better to be consistent.Coverity complained about this today, not sure why, because themistake is in fact old.

1 parente6af7b3 commit2403e54Copy full SHA for 2403e54

File tree

1 file changed

-2

lines changed

src/backend/replication/logical
- reorderbuffer.c

1 file changed

-2

lines changed

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

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1553,7 +1553,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,`
`1553`	`1553`
`1554`	`1554`	`relation=RelationIdGetRelation(reloid);`
`1555`	`1555`
`1556`		`-if (relation==NULL)`
	`1556`	`+if (!RelationIsValid(relation))`
`1557`	`1557`	`elog(ERROR,"could not open relation with OID %u (for filenode \"%s\")",`
`1558`	`1558`	`reloid,`
`1559`	`1559`	`relpathperm(change->data.tp.relnode,`
`@@ -1671,7 +1671,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,`
`1671`	`1671`
`1672`	`1672`	`relation=RelationIdGetRelation(relid);`
`1673`	`1673`
`1674`		`-if (relation==NULL)`
	`1674`	`+if (!RelationIsValid(relation))`
`1675`	`1675`	`elog(ERROR,"could not open relation with OID %u",relid);`
`1676`	`1676`
`1677`	`1677`	`if (!RelationIsLogicallyLogged(relation))`
`@@ -3031,6 +3031,10 @@ ReorderBufferToastReplace(ReorderBuffer rb, ReorderBufferTXN txn,`
`3031`	`3031`	`desc=RelationGetDescr(relation);`
`3032`	`3032`
`3033`	`3033`	`toast_rel=RelationIdGetRelation(relation->rd_rel->reltoastrelid);`
	`3034`	`+if (!RelationIsValid(toast_rel))`
	`3035`	`+elog(ERROR,"could not open relation with OID %u",`
	`3036`	`+relation->rd_rel->reltoastrelid);`
	`3037`	`+`
`3034`	`3038`	`toast_desc=RelationGetDescr(toast_rel);`
`3035`	`3039`
`3036`	`3040`	`/* should we allocate from stack instead? */`

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!

Commit2403e54

File tree

1 file changed

1 file changed

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

0 commit comments