aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-07 12:01:16 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-07 12:01:16 -0500
commit040b478692c2355515eec626044ea2e3c37ca9c5 (patch)
tree6653d6081f0cfe8269fe05c53f34695d022fbdb0
parentef4eb823f3652cfbf5176c277cb21d30bc20d62a (diff)
downloadtor-040b478692c2355515eec626044ea2e3c37ca9c5.tar
tor-040b478692c2355515eec626044ea2e3c37ca9c5.tar.gz
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.
-rw-r--r--src/or/channeltls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index e76bae3da..42d6874d8 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;
}