From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Feb 2014 17:01:16 +0000 (-0500)
Subject: Remove a needless check in channel_tls_handle_incoming
X-Git-Tag: tor-0.2.5.2-alpha~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=040b478692c2355515eec626044ea2e3c37ca9c5;p=thirdparty%2Ftor.git

Remove a needless check in channel_tls_handle_incoming

This patch removes an "if (chan)" that occurred at a place where
chan was definitely non-NULL.  Having it there made some static
analysis tools conclude that we were up to shenanigans.

This resolves #9979.
---

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index e76bae3da2..42d6874d8d 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -287,8 +287,8 @@ channel_tls_handle_incoming(or_connection_t *orconn)
   if (is_local_addr(&(TO_CONN(orconn)->addr))) channel_mark_local(chan);
   channel_mark_incoming(chan);
 
-  /* If we got one, we should register it */
-  if (chan) channel_register(chan);
+  /* Register it */
+  channel_register(chan);
 
   return chan;
 }