Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit69f883f

Browse files
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 parentd807200 commit69f883f

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8128,6 +8128,9 @@ ExtractReplicaIdentity(Relation relation, HeapTuple tp, bool key_changed, bool *
81288128

81298129
idx_rel=RelationIdGetRelation(replidindex);
81308130

8131+
if (!RelationIsValid(idx_rel))
8132+
elog(ERROR,"could not open relation with OID %u",replidindex);
8133+
81318134
/* deform tuple, so we have fast access to columns */
81328135
heap_deform_tuple(tp,desc,values,nulls);
81338136

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
15531553

15541554
relation=RelationIdGetRelation(reloid);
15551555

1556-
if (relation==NULL)
1556+
if (!RelationIsValid(relation))
15571557
elog(ERROR,"could not open relation with OID %u (for filenode \"%s\")",
15581558
reloid,
15591559
relpathperm(change->data.tp.relnode,
@@ -1671,7 +1671,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
16711671

16721672
relation=RelationIdGetRelation(relid);
16731673

1674-
if (relation==NULL)
1674+
if (!RelationIsValid(relation))
16751675
elog(ERROR,"could not open relation with OID %u",relid);
16761676

16771677
if (!RelationIsLogicallyLogged(relation))
@@ -3031,6 +3031,10 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn,
30313031
desc=RelationGetDescr(relation);
30323032

30333033
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+
30343038
toast_desc=RelationGetDescr(toast_rel);
30353039

30363040
/* should we allocate from stack instead? */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp