apps/redis-go
0
0
Fork 0
mirror of https://github.com/HDT3213/godis.git synced 2025-10-04 16:32:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: null bulk reply bytes

Browse Source
This commit is contained in:
finley
2022-09-30 14:24:55 +08:00
parent f160dcfcc9
commit 894be52c31
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
redis/parser/parser.go
View File

@@ -240,7 +240,7 @@ func parseBulkHeader(msg []byte, state *readState) error {
}
if state.bulkLen == -1 { // null bulk
return nil
} else if state.bulkLen > 0 {
} else if state.bulkLen >= 0 {
state.msgType = msg[0]
state.readingMultiLine = true
state.expectedArgsCount = 1
@@ -281,13 +281,13 @@ func parseSingleLineReply(msg []byte) (redis.Reply, error) {
func readBody(msg []byte, state *readState) error {
line := msg[0 : len(msg)-2]
var err error
if line[0] == '$' {
if len(line) > 0 && line[0] == '$' {
// bulk protocol
state.bulkLen, err = strconv.ParseInt(string(line[1:]), 10, 64)
if err != nil {
return errors.New("protocol error: " + string(msg))
}
if state.bulkLen <= 0 { // null bulk in multi bulks
if state.bulkLen < 0 { // null bulk in multi bulks
state.args = append(state.args, []byte{})
state.bulkLen = 0
}