From deababc516644bbabb2461758ecbcc184180dc97 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 23 Mar 2023 15:29:28 -0400 Subject: [PATCH] amcheck: Fix handling when get_xid_status() returns XID_INVALID. In such cases, it doesn't set its output parameter (the third argument), so we shouldn't fall through to code which will test the value of that parameter. There are five existing calls to get_xid_status(), three of which seem to already handle this case properly. This commit tries to fix the other two. If we're checking xmin and find that it is invalid (i.e. 0) just report that as corruption, similar to what's already done in the three cases that seem correct. If we're checking xmax and find that's invalid, that's fine: it just means that the tuple hasn't been updated or deleted. Thanks to Andres Freund and valgrind for finding this problem. --- contrib/amcheck/verify_heapam.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c index fa2df916a9..ce3114f4e6 100644 --- a/contrib/amcheck/verify_heapam.c +++ b/contrib/amcheck/verify_heapam.c @@ -1032,7 +1032,9 @@ check_tuple_visibility(HeapCheckContext *ctx, bool *xmin_commit_status_ok, switch (get_xid_status(xmin, ctx, &xmin_status)) { case XID_INVALID: - break; + report_corruption(ctx, + pstrdup("xmin is invalid")); + return false; case XID_BOUNDS_OK: *xmin_commit_status_ok = true; *xmin_commit_status = xmin_status; @@ -1370,6 +1372,9 @@ check_tuple_visibility(HeapCheckContext *ctx, bool *xmin_commit_status_ok, xmax = HeapTupleHeaderGetRawXmax(tuphdr); switch (get_xid_status(xmax, ctx, &xmax_status)) { + case XID_INVALID: + ctx->tuple_could_be_pruned = false; + return true; case XID_IN_FUTURE: report_corruption(ctx, psprintf("xmax %u equals or exceeds next valid transaction ID %u:%u", @@ -1392,7 +1397,6 @@ check_tuple_visibility(HeapCheckContext *ctx, bool *xmin_commit_status_ok, XidFromFullTransactionId(ctx->oldest_fxid))); return false; /* corrupt */ case XID_BOUNDS_OK: - case XID_INVALID: break; } -- 2.37.1 (Apple Git-137.1)