From 32d225c6440c530c7de143edcf9d3863330d46a9 Mon Sep 17 00:00:00 2001
From: Madelyn Olson <34459052+madolson@users.noreply.github.com>
Date: Tue, 21 Jul 2020 17:00:13 -0700
Subject: [PATCH] Properly reset errno for rdbLoad (#7542)

(cherry picked from commit 9615c7480de53c920baadf6279b527b60de8f0d4)
---
 src/server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server.c b/src/server.c
index 9c2126bc0..db32227bc 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4876,6 +4876,7 @@ void loadDataFromDisk(void) {
             serverLog(LL_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);
     } else {
         rdbSaveInfo rsi = RDB_SAVE_INFO_INIT;
+        errno = 0; /* Prevent a stale value from affecting error checking */
         if (rdbLoad(server.rdb_filename,&rsi,RDBFLAGS_NONE) == C_OK) {
             serverLog(LL_NOTICE,"DB loaded from disk: %.3f seconds",
                 (float)(ustime()-start)/1000000);