summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--server/server.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 1d82ec6..a7881d0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- fixed null pointer in server.c when cConnection::Accept() failes
- consider Pids from channels.conf when HTTP TS streaming. Section filtering
is an optional feature for VDR devices, so we must not rely on the PMT
alone (pointed out by wirbel@vdrportal)
diff --git a/server/server.c b/server/server.c
index 51e0ee1..bc5e83f 100644
--- a/server/server.c
+++ b/server/server.c
@@ -1,5 +1,5 @@
/*
- * $Id: server.c,v 1.8 2008/10/22 11:59:32 schmirl Exp $
+ * $Id: server.c,v 1.9 2008/10/31 12:19:57 schmirl Exp $
*/
#include "server/server.h"
@@ -112,6 +112,8 @@ void cStreamdevServer::Action(void)
for (cServerComponent *c = m_Servers.First(); c; c = m_Servers.Next(c)){
if (sel && select.CanRead(c->Socket())) {
cServerConnection *client = c->Accept();
+ if (!client)
+ continue;
m_Clients.Add(client);
if (m_Clients.Count() > StreamdevServerSetup.MaxClients) {