Fix overflow in mstime() in redis-cli and benchmark.

The problem does not exist in the Redis server implementation of mstime()
but is only limited to redis-cli and redis-benchmark.

Thix fixes issue #839.

diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index 8d72573d5d5301b46ccdff94886eb59e2d1a209c..ceab707238556050c2edc112719c21911bd08f1c 100644 (file)
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -106,7 +106,7 @@ static long long mstime(void) {
     long long mst;
 
     gettimeofday(&tv, NULL);
     long long mst;
 
     gettimeofday(&tv, NULL);

-    mst = ((long)tv.tv_sec)*1000;
+    mst = ((long long)tv.tv_sec)*1000;

     mst += tv.tv_usec/1000;
     return mst;
 }
     mst += tv.tv_usec/1000;
     return mst;
 }

diff --git a/src/redis-cli.c b/src/redis-cli.c
index e8c6be5e0be10da0daab8300f303be70e086897a..3969fbab58c004265dfa23a49aac9b4b9da784a7 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -95,7 +95,7 @@ static long long mstime(void) {
     long long mst;
 
     gettimeofday(&tv, NULL);
     long long mst;
 
     gettimeofday(&tv, NULL);

-    mst = ((long)tv.tv_sec)*1000;
+    mst = ((long long)tv.tv_sec)*1000;

     mst += tv.tv_usec/1000;
     return mst;
 }
     mst += tv.tv_usec/1000;
     return mst;
 }