From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 9 Oct 2017 06:41:06 +0000 (+0200)
Subject: http: xmltv export - escape icon URL, fixes #4659
X-Git-Tag: v4.2.4~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c246c0ad850d20314a23685922dc6377955f6c7d;p=thirdparty%2Ftvheadend.git

http: xmltv export - escape icon URL, fixes #4659
---

diff --git a/src/webui/xmltv.c b/src/webui/xmltv.c
index 54da0452e..d3281a0dc 100644
--- a/src/webui/xmltv.c
+++ b/src/webui/xmltv.c
@@ -66,15 +66,17 @@ http_xmltv_channel_add(htsbuf_queue_t *hq, const char *hostpath, channel_t *ch)
 {
   const char *icon = channel_get_icon(ch);
   char ubuf[UUID_HEX_SIZE];
-  htsbuf_qprintf(hq, "<channel id=\"%s\">\n<display-name>",
+  htsbuf_qprintf(hq, "<channel id=\"%s\">\n  <display-name>",
                  idnode_uuid_as_str(&ch->ch_id, ubuf));
   htsbuf_append_and_escape_xml(hq, channel_get_name(ch));
   htsbuf_append_str(hq, "</display-name>\n");
   if (icon) {
     if (strncmp(icon, "imagecache/", 11) == 0)
-      htsbuf_qprintf(hq, "  <icon src=\"%s/%s\"/>\n", hostpath, icon);
+      htsbuf_qprintf(hq, "  <icon src=\"%s/", hostpath);
     else
-      htsbuf_qprintf(hq, "  <icon src=\"%s\"/>\n", icon);
+      htsbuf_append_str(hq, "  <icon src=\"");
+    htsbuf_append_and_escape_xml(hq, icon);
+    htsbuf_append_str(hq, "\"/>\n");
   }
   htsbuf_append_str(hq, "</channel>\n");
 }