[tor-commits] [tor/maint-0.2.2] Add an assert to un-confuse clang's analyzer

[nickm at torproject.org]

commit 58a16a4d6f47728e029cc8380604bda262a40d30
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Apr 26 02:20:29 2011 +0200

    Add an assert to un-confuse clang's analyzer
    
    The analyzer assumed that bootstrap_percent could be less than 0 when we
    call control_event_bootstrap_problem(), which would mean we're calling
    log_fn() with undefined values. The assert makes it clear this can't
    happen.
---
 src/or/control.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 28780d2..926a465 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3931,6 +3931,9 @@ control_event_bootstrap_problem(const char *warn, int reason)
   char buf[BOOTSTRAP_MSG_LEN];
   const char *recommendation = "ignore";
 
+  /* bootstrap_percent must not be in "undefined" state here. */
+  tor_assert(status >= 0);
+
   if (bootstrap_percent == 100)
     return; /* already bootstrapped; nothing to be done here. */