postgres.git / summary / log / commit / refs

commit    5f73d7294d9fbaa36a0167e7aa6fa693c9c724e6
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sun Sep 08 21:00:30 2019 +0000
First released in: 13.0, 9.4.25, 9.5.20, 9.6.16, 10.11, 11.6, 12.0

    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 38a7a2ca9ad..f630fc4ff4b 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7470,6 +7470,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 fbc2b6fe1ee..40a4c4f497c 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -1535,7 +1535,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,
@@ -2814,6 +2814,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? */


[parent: 1df4123048c4]