From 7d269d5e633911628625d279b54e48c8b38fec90 Mon Sep 17 00:00:00 2001
From: WuYunlong <xzsyeb@126.com>
Date: Sat, 2 Jun 2018 14:29:43 +0800
Subject: [PATCH] Fix DEBUG LOADAOF so that redis-server will not crash
 unexpectedly and will not be inconsistent after we call debug loadaof. Before
 this commit, there were 2 problems:

1, When appendonly is set to no and there is not a appendonly file,
   redis-server will crash if we call DEBUG LOADAOF.
2, When appendonly is set to no and there is a appendonly file,
   redis-server will hold different data after loading  appendonly
   file.
---
 src/debug.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/debug.c b/src/debug.c
index 0ab864e7..26ea4132 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -347,7 +347,11 @@ NULL
         serverLog(LL_WARNING,"DB reloaded by DEBUG RELOAD");
         addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
-        if (server.aof_state == AOF_ON) flushAppendOnlyFile(1);
+        if (server.aof_state == AOF_OFF) {
+            addReply(c, shared.err);
+            return;
+        }
+        flushAppendOnlyFile(1);
         emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
         if (loadAppendOnlyFile(server.aof_filename) != C_OK) {
             addReply(c,shared.err);