Fix for scripting

Author: willnode

mod.go

@@ -13,6 +13,7 @@ const (
 	ModifyAlternate    = "alternate"
 	ModifySort         = "sort"
 	ModifyEvalStyle    = "eval_style"
+	ModifyEvalShaStyle = "evalsha_style"
 	ModifyScanStyle    = "scan_style"
 
 	ReviveFirst  = "first"
@@ -27,7 +28,9 @@ var namespacedCommands = map[string]string{
 	"BRPOP": ModifyExcludeLast, "BRPOPLPUSH": ModifyExcludeLast, "BZPOPMIN": ModifyFirst,
 	"BZPOPMAX": ModifyFirst, "DECR": ModifyFirst, "DECRBY": ModifyFirst, "DEL": ModifyAll,
 	"DUMP": ModifyFirst, "EXISTS": ModifyAll, "EXPIRE": ModifyFirst, "EXPIREAT": ModifyFirst,
-	"EXPIRETIME": ModifyFirst, "EVAL": ModifyEvalStyle, "EVALSHA": ModifyEvalStyle,
+	"EXPIRETIME": ModifyFirst, "EVAL": ModifyEvalStyle, "EVALSHA": ModifyEvalShaStyle,
+	"EVAL_RO": ModifyEvalStyle, "EVALSHA_RO": ModifyEvalShaStyle,
+	"FCALL": ModifyEvalStyle, "FCALL_RO": ModifyEvalStyle,
 	"GET": ModifyFirst, "GETEX": ModifyFirst, "GETBIT": ModifyFirst, "GETRANGE": ModifyFirst,
 	"GETSET": ModifyFirst, "HSET": ModifyFirst, "HSETNX": ModifyFirst, "HGET": ModifyFirst,
 	"HINCRBY": ModifyFirst, "HINCRBYFLOAT": ModifyFirst, "HMGET": ModifyFirst,
@@ -133,8 +136,19 @@ func modSingleCommand(command, username string, args [][]byte) ([][]byte, revive
 				i += 1
 			}
 		}
-	case ModifyEvalStyle:
-		for i := 2; i < 1+len(args)/2; i++ {
+	case ModifyEvalStyle, ModifyEvalShaStyle:
+		kpos := 2
+		if modType == ModifyEvalShaStyle {
+			kpos = 3
+		}
+		if len(args) < kpos {
+			return args, nil
+		}
+		klen, err := parseLen(args[kpos])
+		if err != nil {
+			return args, nil
+		}
+		for i := 3; i < 3+klen; i++ {
 			args[i] = append(namespacePrefix, args[i]...)
 		}
 	case ModifyScanStyle:

reader.go

@@ -38,15 +38,15 @@ func (c *RespReader) readReply(pos, depth int) error {
 	if err != nil {
 		return err
 	}
-	if len(line) < 2 {
+	if len(line) < 3 {
 		return readerError("short response line")
 	}
 	switch line[0] {
 	case '+', '-', ':':
 		c.bw.Write(line)
 		return nil
 	case '$':
-		n, err := parseLen(line[1:])
+		n, err := parseLen(line[1 : len(line)-2])
 		if err != nil {
 			return err
 		}
@@ -66,7 +66,7 @@ func (c *RespReader) readReply(pos, depth int) error {
 		c.bw.Write(p)
 		return nil
 	case '*':
-		n, err := parseLen(line[1:])
+		n, err := parseLen(line[1 : len(line)-2])
 		if err != nil {
 			return err
 		}
@@ -117,13 +117,13 @@ func parseLen(p []byte) (int, error) {
 		return -1, readerError("malformed length")
 	}
 
-	if p[0] == '-' && len(p) == 4 && p[1] == '1' {
+	if p[0] == '-' && len(p) == 2 && p[1] == '1' {
 		// handle $-1 and $-1 null replies.
 		return -1, nil
 	}
 
 	var n int
-	for _, b := range p[:len(p)-2] {
+	for _, b := range p {
 		n *= 10
 		if b < '0' || b > '9' {
 			return -1, readerError("illegal bytes in length")