From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 22 Oct 2018 16:37:35 +0000 (+0200)
Subject: webui: fix http_m3u_playlist_add(), fixes #5274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938f65220e2565ddd03b027a6c7ba02210d9f5e3;p=thirdparty%2Ftvheadend.git

webui: fix http_m3u_playlist_add(), fixes #5274
---

diff --git a/src/webui/webui.c b/src/webui/webui.c
index 45f1c41e3..2ab4e25bf 100644
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -513,6 +513,7 @@ http_m3u_playlist_add(htsbuf_queue_t *hq, const char *hostpath,
                       const char *logo, const char *epgid,
                       int urlauth, access_t *access)
 {
+  const char *delim = "?";
   htsbuf_append_str(hq, "#EXTINF:-1");
   if (logo) {
     if (strncmp(logo, "imagecache/", 11) == 0)
@@ -529,14 +530,17 @@ http_m3u_playlist_add(htsbuf_queue_t *hq, const char *hostpath,
   case URLAUTH_NONE:
     break;
   case URLAUTH_TICKET:
-    htsbuf_qprintf(hq, "?ticket=%s", access_ticket_create(url_remain, access));
+    htsbuf_qprintf(hq, "%sticket=%s", delim, access_ticket_create(url_remain, access));
+    delim = "&";
     break;
   case URLAUTH_CODE:
-    if (!strempty(access->aa_auth))
-      htsbuf_qprintf(hq, "?auth=%s", access->aa_auth);
+    if (!strempty(access->aa_auth)) {
+      htsbuf_qprintf(hq, "%sauth=%s", delim, access->aa_auth);
+      delim = "&";
+    }
     break;
   }
-  htsbuf_qprintf(hq, "&profile=%s\n", profile);
+  htsbuf_qprintf(hq, "%sprofile=%s\n", delim, profile);
 }
 
 /*