commit f539d89fd9d19e44596976a42c12d4fd41f1d0fc Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 26 17:34:49 2017 -0500
Move subtraction in rephist to try to avoid STACK warning
(I do not know why this one is happening) --- src/or/rephist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/or/rephist.c b/src/or/rephist.c index 51e800bc3..b63cdbfcd 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