From 348bd83b08857e7302e9e17fb77603372096c7d9 Mon Sep 17 00:00:00 2001
From: HubretXie <xiexianbin@gmail.com>
Date: Wed, 20 Mar 2019 14:54:17 +0800
Subject: 【修复】修复计算中间值溢出问题
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rt_tick_from_millisecond
当入参较大时，计算中间值会出现溢出情况，导致转换结果出错
---
 src/clock.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/clock.c')

diff --git a/src/clock.c b/src/clock.c
index 4fa73da472..5fcd1d4ae4 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -107,15 +107,20 @@ void rt_tick_increase(void)
  *
  * @return the calculated tick
  */
-int rt_tick_from_millisecond(rt_int32_t ms)
+rt_tick_t rt_tick_from_millisecond(rt_int32_t ms)
 {
-    int tick;
+    rt_tick_t tick;
 
     if (ms < 0)
+    {    
         tick = RT_WAITING_FOREVER;
+    }
     else
-        tick = (RT_TICK_PER_SECOND * ms + 999) / 1000;
-
+    {
+        tick = RT_TICK_PER_SECOND * (ms / 1000);
+        tick += (RT_TICK_PER_SECOND * (ms%1000) + 999) / 1000;
+    }
+    
     /* return the calculated tick */
     return tick;
 }
-- 
cgit v1.3.1