Makefile deps updated

[redis.git] / src / object.c

diff --git a/src/object.c b/src/object.c
index b16123eba641ba3307fbaacb9320cf8a80f3026b..92af1d6a9e7ac6f2f5919d0c0ff3f51a856f9e55 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -375,8 +375,9 @@ int getLongLongFromObject(robj *o, long long *target) {
         redisAssert(o->type == REDIS_STRING);
         if (o->encoding == REDIS_ENCODING_RAW) {
             value = strtoll(o->ptr, &eptr, 10);
         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 (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 {
         } else if (o->encoding == REDIS_ENCODING_INT) {
             value = (long)o->ptr;
         } else {


@@ -394,7 +395,7 @@ int getLongLongFromObjectOrReply(redisClient *c, robj *o, long long *target, con
         if (msg != NULL) {
             addReplySds(c, sdscatprintf(sdsempty(), "-ERR %s\r\n", msg));
         } else {
         if (msg != NULL) {
             addReplySds(c, sdscatprintf(sdsempty(), "-ERR %s\r\n", msg));
         } else {

-            addReplySds(c, sdsnew("-ERR value is not an integer\r\n"));
+            addReplySds(c, sdsnew("-ERR value is not an integer or out of range\r\n"));

         }
         return REDIS_ERR;
     }
         }
         return REDIS_ERR;
     }