From fbef85ca5aca774c7533c6e0760edfd6258948c7 Mon Sep 17 00:00:00 2001
From: "zhaozhao.zz" <zhaozhao.zz@alibaba-inc.com>
Date: Thu, 29 Mar 2018 23:20:58 +0800
Subject: [PATCH] debug: avoid free client unexpectedly when reload & loadaof

---
 src/debug.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/debug.c b/src/debug.c
index 293dbe36e..5d5029f5a 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -340,7 +340,10 @@ NULL
             return;
         }
         emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
-        if (rdbLoad(server.rdb_filename,NULL) != C_OK) {
+        aeDeleteFileEvent(server.el,c->fd,AE_READABLE);
+        int ret = rdbLoad(server.rdb_filename,NULL);
+        aeCreateFileEvent(server.el,c->fd,AE_READABLE,readQueryFromClient,c);
+        if (ret != C_OK) {
             addReplyError(c,"Error trying to load the RDB dump");
             return;
         }
@@ -349,7 +352,10 @@ NULL
     } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
         if (server.aof_state == AOF_ON) flushAppendOnlyFile(1);
         emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
-        if (loadAppendOnlyFile(server.aof_filename) != C_OK) {
+        aeDeleteFileEvent(server.el,c->fd,AE_READABLE);
+        int ret = loadAppendOnlyFile(server.aof_filename);
+        aeCreateFileEvent(server.el,c->fd,AE_READABLE,readQueryFromClient,c);
+        if (ret != C_OK) {
             addReply(c,shared.err);
             return;
         }