From: Andrea Shepard <andrea@torproject.org>
Date: Tue, 9 Oct 2012 02:50:41 +0000 (-0700)
Subject: channel_free() should be a no-op
X-Git-Tag: tor-0.2.4.4-alpha~37^2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64e6f6687c8fc275ddc207fa43f29c4213d3cad2;p=thirdparty%2Ftor.git

channel_free() should be a no-op
---

diff --git a/src/or/channel.c b/src/or/channel.c
index 2fe4466e53..690bfb92a7 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -763,7 +763,8 @@ channel_init_listener(channel_t *chan)
 void
 channel_free(channel_t *chan)
 {
-  tor_assert(chan);
+  if (!chan) return;
+
   /* It must be closed or errored */
   tor_assert(chan->state == CHANNEL_STATE_CLOSED ||
              chan->state == CHANNEL_STATE_ERROR);