From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Apr 2003 01:59:41 +0000 (+0000)
Subject: tv_udiff: do not modify arguments, and compute results correctly.
X-Git-Tag: tor-0.0.2pre8~223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2da6482f639871784b445187347314e8d026bdb1;p=thirdparty%2Ftor.git

tv_udiff: do not modify arguments, and compute results correctly.


svn:r245
---

diff --git a/src/common/util.c b/src/common/util.c
index 743df0bbb1..600a8e614d 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -23,16 +23,18 @@ long
 tv_udiff(struct timeval *start, struct timeval *end)
 {
   long udiff;
+  long end_usec = end->tv_usec;
   long secdiff = end->tv_sec - start->tv_sec;
+
   if (secdiff+1 > LONG_MAX/1000000) {
     log(LOG_NOTICE, "tv_udiff(): comparing times too far apart.");
     return LONG_MAX;
   }
-  if (end->tv_usec < start->tv_usec) {
-    end->tv_sec--;
-    end->tv_usec += 1000000L;
+  if (end_usec < start->tv_usec) {
+    secdiff--;
+    end_usec += 1000000L;
   }
-  udiff = secdiff*1000000L + (end->tv_usec - start->tv_usec);
+  udiff = secdiff*1000000L + (end_usec - start->tv_usec);
   if(udiff < 0) {
     log(LOG_NOTICE, "tv_udiff(): start is after end. Returning 0.");
     return 0;