Merge remote branch 'pietern/zfixes'

[redis.git] / redis.c

diff --git a/redis.c b/redis.c
index 1e1cd78163ed0bef0b7d288ed57b348713c07ac9..6fe951d3fa79f03259735c3b8a7807705283cd3a 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -5404,9 +5404,9 @@ static void lrangeCommand(redisClient *c) {
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;

-    if (end < 0) end = 0;

 
 

-    /* indexes sanity checks */
+    /* Invariant: start >= 0, so this test will be true when end < 0.
+     * The range is empty when start > end or start >= length. */

     if (start > end || start >= llen) {
         /* Out of range start or start > end result in empty list */
         addReply(c,shared.emptymultibulk);
     if (start > end || start >= llen) {
         /* Out of range start or start > end result in empty list */
         addReply(c,shared.emptymultibulk);


@@ -5444,9 +5444,9 @@ static void ltrimCommand(redisClient *c) {
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;

-    if (end < 0) end = 0;

 
 

-    /* indexes sanity checks */
+    /* Invariant: start >= 0, so this test will be true when end < 0.
+     * The range is empty when start > end or start >= length. */

     if (start > end || start >= llen) {
         /* Out of range start or start > end result in empty list */
         ltrim = llen;
     if (start > end || start >= llen) {
         /* Out of range start or start > end result in empty list */
         ltrim = llen;


@@ -6409,9 +6409,9 @@ static void zremrangebyrankCommand(redisClient *c) {
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;

-    if (end < 0) end = 0;

 
 

-    /* indexes sanity checks */
+    /* Invariant: start >= 0, so this test will be true when end < 0.
+     * The range is empty when start > end or start >= length. */

     if (start > end || start >= llen) {
         addReply(c,shared.czero);
         return;
     if (start > end || start >= llen) {
         addReply(c,shared.czero);
         return;


@@ -6662,11 +6662,10 @@ static void zrangeGenericCommand(redisClient *c, int reverse) {
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;
     if (start < 0) start = llen+start;
     if (end < 0) end = llen+end;
     if (start < 0) start = 0;

-    if (end < 0) end = 0;

 
 

-    /* indexes sanity checks */
+    /* Invariant: start >= 0, so this test will be true when end < 0.
+     * The range is empty when start > end or start >= length. */

     if (start > end || start >= llen) {
     if (start > end || start >= llen) {

-        /* Out of range start or start > end result in empty list */

         addReply(c,shared.emptymultibulk);
         return;
     }
         addReply(c,shared.emptymultibulk);
         return;
     }