From 60870d3a10fd9496a3860ec77a953a51fa3410c6 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 13 Jan 2020 13:16:13 +0100
Subject: [PATCH] Jump to right label on AOF parsing error.

Related to #6054.
---
 src/aof.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/aof.c b/src/aof.c
index d9db308bb..54fbb6f5f 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -782,12 +782,14 @@ int loadAppendOnlyFile(char *filename) {
 
         for (j = 0; j < argc; j++) {
             /* Parse the argument len. */
-            if (fgets(buf,sizeof(buf),fp) == NULL ||
-                buf[0] != '$')
-            {
+            char *readres = fgets(buf,sizeof(buf),fp);
+            if (readres == NULL || buf[0] != '$') {
                 fakeClient->argc = j; /* Free up to j-1. */
                 freeFakeClientArgv(fakeClient);
-                goto readerr;
+                if (readres == NULL)
+                    goto readerr;
+                else
+                    goto fmterr;
             }
             len = strtol(buf+1,NULL,10);
 
-- 
GitLab