Merge pull request #1019 from iyesin/make-hincrby-long-again

yatsukhnenko · web-flow · commit 58e1d799ee15 · 2016-11-16T13:09:17.000+02:00
Fix integer overflow for long (&gt;32bit) increments in hIncrBy
diff --git a/redis_commands.c b/redis_commands.c
@@ -1412,7 +1412,7 @@ int redis_hincrby_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     key_free = redis_key_prefix(redis_sock, &key, (int *)&key_len);
 
     // Construct command
-    *cmd_len = redis_cmd_format_static(cmd, "HINCRBY", "ssd", key, key_len, mem,
+    *cmd_len = redis_cmd_format_static(cmd, "HINCRBY", "ssl", key, key_len, mem,
                                        mem_len, byval);
     // Set slot
     CMD_SET_SLOT(slot,key,key_len);
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -2290,6 +2290,8 @@ public function testHashes() {
         $this->assertTrue(3 === $this->redis->hIncrBy('h', 'x', 1));
         $this->assertTrue(2 === $this->redis->hIncrBy('h', 'x', -1));
         $this->assertTrue("2" === $this->redis->hGet('h', 'x'));
+        $this->assertTrue(1000000000002 === $this->redis->hIncrBy('h', 'x', 1000000000000));
+        $this->assertTrue("1000000000002" === $this->redis->hGet('h', 'x'));
 
         $this->redis->hSet('h', 'y', 'not-a-number');
         $this->assertTrue(FALSE === $this->redis->hIncrBy('h', 'y', 1));
@@ -2300,6 +2302,7 @@ public function testHashes() {
             $this->assertTrue(1.5 === $this->redis->hIncrByFloat('h','x', 1.5));
             $this->assertTrue(3.0 === $this->redis->hincrByFloat('h','x', 1.5));
             $this->assertTrue(1.5 === $this->redis->hincrByFloat('h','x', -1.5));
+            $this->assertTrue(1000000000001.5 === $this->redis->hincrByFloat('h','x', 1000000000000));
 
             $this->redis->hset('h','y','not-a-number');
             $this->assertTrue(FALSE === $this->redis->hIncrByFloat('h', 'y', 1.5));
