diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 23:14:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 23:14:28 -0400 |
| commit | d443658fade3b4090d0b93903b4aec857cab03ea (patch) | |
| tree | a63e8ddaf855ae9d549e0c2693f6e50c4127dd85 /src/or/channel.c | |
| parent | 789c8d8573b9969acd808bb19d211d4ae9ac3be4 (diff) | |
| parent | 0044d74b3c51cf5824435e76eca2a675b51a14bc (diff) | |
| download | tor-d443658fade3b4090d0b93903b4aec857cab03ea.tar.gz tor-d443658fade3b4090d0b93903b4aec857cab03ea.zip | |
Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 3072effc8f..ffd68493d0 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2682,6 +2682,14 @@ int channel_send_destroy(circid_t circ_id, channel_t *chan, int reason) { tor_assert(chan); + if (circ_id == 0) { + log_warn(LD_BUG, "Attempted to send a destroy cell for circID 0 " + "on a channel " U64_FORMAT " at %p in state %s (%d)", + U64_PRINTF_ARG(chan->global_identifier), + chan, channel_state_to_string(chan->state), + chan->state); + return 0; + } /* Check to make sure we can send on this channel first */ if (!(chan->state == CHANNEL_STATE_CLOSING || |