From: dave-p <gh@pickles.me.uk>
Date: Sat, 31 Mar 2018 14:48:26 +0000 (+0100)
Subject: Fix server crash in satip_server_http_page
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce30775fa0cded397dd024b5e42b506e59db95bf;p=thirdparty%2Ftvheadend.git

Fix server crash in satip_server_http_page

Accessing http://your.ip:9981/satip_server/ crashes TVHeadend. The fix also returns Bad Request for unexpected filenames.
---

diff --git a/src/satip/server.c b/src/satip/server.c
index 5e7c83bcb..f0ad778fc 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -264,11 +264,11 @@ int
 satip_server_http_page(http_connection_t *hc,
                        const char *remain, void *opaque)
 {
-  if (strcmp(remain, "desc.xml") == 0)
+  if (remain && strcmp(remain, "desc.xml") == 0)
     return satip_server_http_xml(hc);
-  if (strcmp(remain, "satip.m3u") == 0)
+  if (remain && strcmp(remain, "satip.m3u") == 0)
     return satip_server_satip_m3u(hc);
-  return 0;
+  return HTTP_STATUS_BAD_REQUEST;
 }
 
 /*