]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Fix server crash in satip_server_http_page
authordave-p <gh@pickles.me.uk>
Sat, 31 Mar 2018 14:48:26 +0000 (15:48 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sun, 1 Apr 2018 19:44:11 +0000 (21:44 +0200)
Accessing http://your.ip:9981/satip_server/ crashes TVHeadend. The fix also returns Bad Request for unexpected filenames.

src/satip/server.c

index 5e7c83bcbcb4d2659e58dc6e3b1f7633a0d4f339..f0ad778fc036f1cf74fd7b42bcf6ef735b27fad0 100644 (file)
@@ -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;
 }
 
 /*