Browse Source

Fix an always-true assert in PT code.

George Kadianakis 10 years ago
parent
commit
9e0ed8136a
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug10046
  2. 1 1
      src/or/transports.c

+ 3 - 0
changes/bug10046

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Fix an always-true assertion in pluggable transports code. Fixes
+      issue 10046. Found by dcb.

+ 1 - 1
src/or/transports.c

@@ -552,7 +552,7 @@ pt_configure_remaining_proxies(void)
   assert_unconfigured_count_ok();
 
   SMARTLIST_FOREACH_BEGIN(tmp,  managed_proxy_t *, mp) {
-    tor_assert(mp->conf_state != PT_PROTO_BROKEN ||
+    tor_assert(mp->conf_state != PT_PROTO_BROKEN &&
                mp->conf_state != PT_PROTO_FAILED_LAUNCH);
 
     if (mp->got_hup) {