aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/transam/xlog.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-11-06 11:29:40 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2016-11-06 11:29:40 -0500
commit5485c99e7f507b2849ac675e9c10f34551f645b6 (patch)
tree90f2bb5f36e74d7b9bf2d8f3e737412f0590166b /src/backend/access/transam/xlog.c
parent32416b0f9a8502e7dff8afbf78e494c091b045e8 (diff)
downloadpostgresql-5485c99e7f507b2849ac675e9c10f34551f645b6.tar.gz
postgresql-5485c99e7f507b2849ac675e9c10f34551f645b6.zip
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
Diffstat (limited to 'src/backend/access/transam/xlog.c')
-rw-r--r--src/backend/access/transam/xlog.c2
1 files changed, 1 insertions, 1 deletions
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)
{