[tor-commits] [tor/master] Unpack a smartlist_foreach and add an assert: try to hunt #5102

[nickm at torproject.org]

commit 61452299d1067298a2865deb6398b1fb269b2a81
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 12 19:42:35 2012 -0500

    Unpack a smartlist_foreach and add an assert: try to hunt #5102
---
 src/or/circuitbuild.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 07598e2..7c404e6 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -3906,14 +3906,14 @@ entry_guard_register_connect_status(const char *digest, int succeeded,
   if (! entry_guards)
     return 0;
 
-  SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e,
-    {
-      if (tor_memeq(e->identity, digest, DIGEST_LEN)) {
-        entry = e;
-        idx = e_sl_idx;
-        break;
-      }
-    });
+  SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) {
+    tor_assert(e);
+    if (tor_memeq(e->identity, digest, DIGEST_LEN)) {
+      entry = e;
+      idx = e_sl_idx;
+      break;
+    }
+  } SMARTLIST_FOREACH_END(e);
 
   if (!entry)
     return 0;