From: antirez <antirez@gmail.com>
Date: Thu, 26 Aug 2010 10:04:24 +0000 (+0200)
Subject: Merge remote branch 'pietern/intset-split'
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/acc75bfd4f1607625876d74d6447efaaf505db59

Merge remote branch 'pietern/intset-split'
---

acc75bfd4f1607625876d74d6447efaaf505db59
diff --cc src/object.c
index 429ac0ec,b16123eb..dae7f97b
--- a/src/object.c
+++ b/src/object.c
@@@ -357,9 -375,8 +375,10 @@@ int getLongLongFromObject(robj *o, lon
          redisAssert(o->type == REDIS_STRING);
          if (o->encoding == REDIS_ENCODING_RAW) {
              value = strtoll(o->ptr, &eptr, 10);
+             if (errno == ERANGE) return REDIS_ERR;
              if (eptr[0] != '\0') return REDIS_ERR;
 +            if (errno == ERANGE && (value == LLONG_MIN || value == LLONG_MAX))
 +                return REDIS_ERR;
          } else if (o->encoding == REDIS_ENCODING_INT) {
              value = (long)o->ptr;
          } else {