From 5485c99e7f507b2849ac675e9c10f34551f645b6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 6 Nov 2016 11:29:40 -0500 Subject: [PATCH] Fix silly nil-pointer-dereference bug introduced in commit d5f6f13f8. Don't fetch record->xl_info before we've verified that record isn't NULL. Per Coverity. Michael Paquier --- src/backend/access/transam/xlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 813f6467fdf..6cec02797a3 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7812,7 +7812,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, } record = ReadRecord(xlogreader, RecPtr, LOG, true); - info = record->xl_info & ~XLR_INFO_MASK; if (record == NULL) { @@ -7855,6 +7854,7 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, } return NULL; } + info = record->xl_info & ~XLR_INFO_MASK; if (info != XLOG_CHECKPOINT_SHUTDOWN && info != XLOG_CHECKPOINT_ONLINE) { -- 2.30.2