From 1d87b674828ad3d49b74d0190184d861f183fb30 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 8 Sep 2019 17:00:29 -0400 Subject: [PATCH] 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. --- src/backend/access/heap/heapam.c | 4 ++++ src/backend/replication/logical/reorderbuffer.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index f2f7396c006..fe3e83b4894 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8002,6 +8002,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 d147735ce74..c8464847d5f 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -1614,7 +1614,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, @@ -3016,6 +3016,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? */