fix redis#2419 - fix RESP2 array decoder in edge cases

leibale · Feb 23, 2023 · f32cefd · f32cefd
1 parent 1be8422
commit f32cefd
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/packages/client/lib/client/RESP2/decoder.ts b/packages/client/lib/client/RESP2/decoder.ts
@@ -203,9 +203,9 @@ export default class RESP2Decoder {
             this.arrayItemType = undefined;
 
             if (length === -1) {
-                return this.returnArrayReply(null, arraysToKeep);
+                return this.returnArrayReply(null, arraysToKeep, chunk);
             } else if (length === 0) {
-                return this.returnArrayReply([], arraysToKeep);
+                return this.returnArrayReply([], arraysToKeep, chunk);
             }
 
             this.arraysInProcess.push({
@@ -235,20 +235,23 @@ export default class RESP2Decoder {
         }
     }
 
-    private returnArrayReply(reply: ArrayReply, arraysToKeep: number): ArrayReply | undefined {
+    private returnArrayReply(reply: ArrayReply, arraysToKeep: number, chunk?: Buffer): ArrayReply | undefined {
         if (this.arraysInProcess.length <= arraysToKeep) return reply;
 
-        return this.pushArrayItem(reply, arraysToKeep);
+        return this.pushArrayItem(reply, arraysToKeep, chunk);
     }
 
-    private pushArrayItem(item: Reply, arraysToKeep: number): ArrayReply | undefined {
+    private pushArrayItem(item: Reply, arraysToKeep: number, chunk?: Buffer): ArrayReply | undefined {
         const to = this.arraysInProcess[this.arraysInProcess.length - 1]!;
         to.array[to.pushCounter] = item;
         if (++to.pushCounter === to.array.length) {
             return this.returnArrayReply(
                 this.arraysInProcess.pop()!.array,
-                arraysToKeep
+                arraysToKeep,
+                chunk
             );
+        } else if (chunk && chunk.length > this.cursor) {
+            return this.parseArray(chunk, arraysToKeep);
         }
     }
 }