Merge remote branch 'pietern/intset-split'

diff --cc src/object.c
index 429ac0ecc6cd7eea9cabd7b987701dd9153278a0,b16123eba641ba3307fbaacb9320cf8a80f3026b..dae7f97b21924fdda844e4e07a1b276cba0d7350
--- 1/src/object.c
--- 2/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 {

diff --cc src/redis.c
Simple merge

diff --cc src/redis.h
Simple merge