From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 26 Nov 2017 22:34:49 +0000 (-0500)
Subject: Move subtraction in rephist to try to avoid STACK warning
X-Git-Tag: tor-0.3.2.7-rc~13^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f539d89fd9d19e44596976a42c12d4fd41f1d0fc;p=thirdparty%2Ftor.git

Move subtraction in rephist to try to avoid STACK warning

(I do not know why this one is happening)
---

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 51e800bc31..b63cdbfcd6 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1811,7 +1811,7 @@ static time_t last_prediction_add_time=0;
 int
 predicted_ports_prediction_time_remaining(time_t now)
 {
-  time_t idle_delta = now - last_prediction_add_time;
+  time_t idle_delta;
 
   /* Protect against overflow of return value. This can happen if the clock
    * jumps backwards in time. Update the last prediction time (aka last
@@ -1821,6 +1821,8 @@ predicted_ports_prediction_time_remaining(time_t now)
   if (last_prediction_add_time > now) {
     last_prediction_add_time = now;
     idle_delta = 0;
+  } else {
+    idle_delta = now - last_prediction_add_time;
   }
 
   /* Protect against underflow of the return value. This can happen for very