redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-07 13:22:56 +03:00
Code Activity

fix #2419 - fix RESP2 array decoder in edge cases (#2424)

Browse Source
This commit is contained in:
Leibale Eidelman
2023-02-24 17:34:19 -05:00
committed by GitHub
parent 63e5228ce6
commit e95b258dca
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/client/lib/client/RESP2/decoder.ts
View File

@@ -203,9 +203,9 @@ export default class RESP2Decoder {
this.arrayItemType = undefined; this.arrayItemType = undefined;
if (length === -1) { if (length === -1) {
return this.returnArrayReply(null, arraysToKeep); return this.returnArrayReply(null, arraysToKeep, chunk);
} else if (length === 0) { } else if (length === 0) {
return this.returnArrayReply([], arraysToKeep); return this.returnArrayReply([], arraysToKeep, chunk);
} }
this.arraysInProcess.push({ 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; 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]!; const to = this.arraysInProcess[this.arraysInProcess.length - 1]!;
to.array[to.pushCounter] = item; to.array[to.pushCounter] = item;
if (++to.pushCounter === to.array.length) { if (++to.pushCounter === to.array.length) {
return this.returnArrayReply( return this.returnArrayReply(
this.arraysInProcess.pop()!.array, this.arraysInProcess.pop()!.array,
arraysToKeep arraysToKeep,
chunk
); );
} else if (chunk && chunk.length > this.cursor) {
return this.parseArray(chunk, arraysToKeep);
} }
} }
} }