diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-09-08 17:00:29 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-09-08 17:00:54 -0400 |
| commit | deba7c6fc3ccbaadfccbf70f73480d33a27b15b4 (patch) | |
| tree | a874229f78a34d80e6d95fa8879802d994fcbfde | |
| parent | 92f6b49c48a3b9c829d4117d59e89128455dbf5f (diff) | |
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 same
but it seems better to be consistent.
Coverity complained about this today, not sure why, because the
mistake is in fact old.
| -rw-r--r-- | src/backend/access/heap/heapam.c | 4 | ||||
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index d00f4f23e5f..f8914f778c0 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7976,6 +7976,10 @@ ExtractReplicaIdentity(Relation relation, HeapTuple tp, bool key_changed, bool * } idx_rel = RelationIdGetRelation(replidindex); + + if (!RelationIsValid(idx_rel)) + elog(ERROR, "could not open relation with OID %u", replidindex); + idx_desc = RelationGetDescr(idx_rel); /* deform tuple, so we have fast access to columns */ diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 392757001f9..be441c7c7d6 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -1561,7 +1561,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid, relation = RelationIdGetRelation(reloid); - if (relation == NULL) + if (!RelationIsValid(relation)) elog(ERROR, "could not open relation with OID %u (for filenode \"%s\")", reloid, relpathperm(change->data.tp.relnode, @@ -2969,6 +2969,10 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn, desc = RelationGetDescr(relation); toast_rel = RelationIdGetRelation(relation->rd_rel->reltoastrelid); + if (!RelationIsValid(toast_rel)) + elog(ERROR, "could not open relation with OID %u", + relation->rd_rel->reltoastrelid); + toast_desc = RelationGetDescr(toast_rel); /* should we allocate from stack instead? */ |