From: ajs <ajs>
Date: Tue, 28 Dec 2004 17:00:12 +0000 (+0000)
Subject: 2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
X-Git-Tag: frr-2.0-rc1~3276
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=af04bd7c102c3fc1a9c2e98337b0ab1fa824d080;p=matthieu%2Ffrr.git

2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* thread.c: (funcname_thread_add_timer_msec) Reduce overflow risk.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 07eb21d1c5..cc5f86731a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* thread.c: (funcname_thread_add_timer_msec) Reduce overflow risk.
+
 2004-12-21 Paul Jakma <paul.jakma@sun.com>
 
 	* if.h: Add more 'non-generic' IFF_ flags.
diff --git a/lib/thread.c b/lib/thread.c
index 89df06a09b..05212d8561 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -550,10 +550,8 @@ funcname_thread_add_timer_msec (struct thread_master *m,
 
   assert (m != NULL);
 
-  timer = 1000*timer; /* milli -> micro */
-
-  trel.tv_sec = timer / TIMER_SECOND_MICRO;
-  trel.tv_usec = (timer % TIMER_SECOND_MICRO);
+  trel.tv_sec = timer / 1000;
+  trel.tv_usec = 1000*(timer % 1000);
 
   return funcname_thread_add_timer_timeval (m, func, arg, &trel, funcname);
 }