Prevent "interval" overflow in ExtUvLoop

PabloKowalczyk · PabloKowalczyk · commit 4e32262b830b · 2019-05-24T08:33:01.000+02:00
diff --git a/src/ExtUvLoop.php b/src/ExtUvLoop.php
@@ -127,7 +127,7 @@ public function addTimer($interval, $callback)
         $this->timers->attach($timer, $event);
         \uv_timer_start(
             $event,
-            (int) ($interval * 1000) + 1,
+            $this->convertFloatSecondsToMilliseconds($interval),
             0,
             $callback
         );
@@ -150,8 +150,8 @@ public function addPeriodicTimer($interval, $callback)
         $this->timers->attach($timer, $event);
         \uv_timer_start(
             $event,
-            (int) ($interval * 1000) + 1,
-            (int) ($interval * 1000) + 1,
+            $this->convertFloatSecondsToMilliseconds($interval),
+            $this->convertFloatSecondsToMilliseconds($interval),
             $callback
         );
 
@@ -313,4 +313,31 @@ private function createStreamListener()
 
         return $callback;
     }
+
+    /**
+     * @param float $interval
+     * @return int
+     */
+    private function convertFloatSecondsToMilliseconds($interval)
+    {
+        if ($interval < 0) {
+            throw new \InvalidArgumentException('Interval cannot be lower than 0.');
+        }
+
+        // Subtract 2 because 1 doesn't seems to work and may give wrong results
+        $maxValue = ((int) (\PHP_INT_MAX / 1000)) - 2;
+
+        if ($interval > $maxValue) {
+            throw new \InvalidArgumentException(
+                "Interval overflow, maximum value is '{$maxValue}', but '{$interval}' passed."
+            );
+        }
+
+        $result = (int) \floor($interval * 1000);
+
+        return $result === 0
+            ? 1
+            : $result
+        ;
+    }
 }
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -591,9 +591,11 @@ public function testSignalsKeepTheLoopRunningAndRemovingItStopsTheLoop()
 
     public function testTimerIntervalCanBeFarInFuture()
     {
+        // Maximum interval for ExtUvLoop implementation
+        $interval = (PHP_INT_MAX / 1000) - 2;
         $loop = $this->loop;
         // start a timer very far in the future
-        $timer = $this->loop->addTimer(PHP_INT_MAX, function () { });
+        $timer = $this->loop->addTimer($interval, function () { });
 
         $this->loop->futureTick(function () use ($timer, $loop) {
             $loop->cancelTimer($timer);
diff --git a/tests/ExtUvLoopTest.php b/tests/ExtUvLoopTest.php
@@ -14,4 +14,36 @@ public function createLoop()
 
         return new ExtUvLoop();
     }
+
+    /** @dataProvider intervalProvider */
+    public function testTimerInterval($interval, $expectedExceptionMessage)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $this->loop
+            ->addTimer(
+                $interval,
+                function () {
+                    return 0;
+                }
+            );
+    }
+
+    public function intervalProvider()
+    {
+        $oversizeInterval = PHP_INT_MAX / 1000;
+        $maxValue = ((int) (PHP_INT_MAX / 1000)) - 2;
+
+        return array(
+            array(
+                -1,
+                'Interval cannot be lower than 0.'
+            ),
+            array(
+                $oversizeInterval,
+                "Interval overflow, maximum value is '{$maxValue}', but '{$oversizeInterval}' passed."
+            )
+        );
+    }
 }
