diff options
| -rw-r--r-- | src/aof.c | 5 | ||||
| -rw-r--r-- | src/cluster.c | 8 |
2 files changed, 4 insertions, 9 deletions
@@ -1137,10 +1137,7 @@ int rioWriteBulkStreamID(rio *r,streamID *id) { int retval; sds replyid = sdscatfmt(sdsempty(),"%U-%U",id->ms,id->seq); - if ((retval = rioWriteBulkString(r,replyid,sdslen(replyid))) == 0) { - sdsfree(replyid); - return 0; - } + retval = rioWriteBulkString(r,replyid,sdslen(replyid)); sdsfree(replyid); return retval; } diff --git a/src/cluster.c b/src/cluster.c index 42666746d..02b6c2cfd 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -276,11 +276,9 @@ int clusterLoadConfig(char *filename) { } else { start = stop = atoi(argv[j]); } - if (start < 0 || start >= CLUSTER_SLOTS) { - sdsfreesplitres(argv,argc); - goto fmterr; - } - if (stop < 0 || stop >= CLUSTER_SLOTS) { + if (start < 0 || start >= CLUSTER_SLOTS || + stop < 0 || stop >= CLUSTER_SLOTS) + { sdsfreesplitres(argv,argc); goto fmterr; } |