From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 20 Sep 2014 19:07:49 +0000 (+0200)
Subject: tcp: don't crash when tcp server cannot be registered, fixes #2315
X-Git-Tag: v4.1~1299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=710119a707879eef8d42aa40bb9e4d0d6143caa6;p=thirdparty%2Ftvheadend.git

tcp: don't crash when tcp server cannot be registered, fixes #2315
---

diff --git a/src/tcp.c b/src/tcp.c
index ce92ae60f..27808c461 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -622,6 +622,9 @@ void tcp_server_register(void *server)
   tcp_server_t *ts = server;
   tvhpoll_event_t ev;
 
+  if (ts == NULL)
+    return;
+
   memset(&ev, 0, sizeof(ev));
 
   ev.fd       = ts->serverfd;