From: Jeff Davis <jdavis@postgresql.org>
Date: Fri, 8 Apr 2022 09:30:57 +0000 (-0700)
Subject: Check XLogRecHasBlockRef() before XLogRecHasBlockImage().
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=12aaae5131af343b7cd2fdef05dee82c25d8aaf8;p=users%2Frhaas%2Fpostgres.git

Check XLogRecHasBlockRef() before XLogRecHasBlockImage().

Trial fix of buildfarm failures on kestrel and tamandua.
---

diff --git a/src/backend/access/transam/xlogstats.c b/src/backend/access/transam/xlogstats.c
index aff3069ecb..6524a1ad0b 100644
--- a/src/backend/access/transam/xlogstats.c
+++ b/src/backend/access/transam/xlogstats.c
@@ -33,6 +33,9 @@ XLogRecGetLen(XLogReaderState *record, uint32 *rec_len,
 	*fpi_len = 0;
 	for (block_id = 0; block_id <= XLogRecMaxBlockId(record); block_id++)
 	{
+		if (!XLogRecHasBlockRef(record, block_id))
+			continue;
+
 		if (XLogRecHasBlockImage(record, block_id))
 			*fpi_len += XLogRecGetBlock(record, block_id)->bimg_len;
 	}