Browse Source

Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1()

This shouldn't be possible while Tor is running, but the tests can
hit this code.  Rather than force the tests to add a dummy channel
object, let's just tolerate their incompletely built circuits.
Nick Mathewson 6 years ago
parent
commit
f14ce4bce6
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/feature/hs/hs_intropoint.c

+ 1 - 1
src/feature/hs/hs_intropoint.c

@@ -548,7 +548,7 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ)
   }
 
   /* Disallow single hop client circuit. */
-  if (channel_is_client(circ->p_chan)) {
+  if (circ->p_chan && channel_is_client(circ->p_chan)) {
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Single hop client was rejected while trying to introduce. "
            "Closing circuit.");