From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 15 Jun 2017 18:45:34 +0000 (+0200)
Subject: m3u: fix m3u-url decoding (2nd try), fixes #4432
X-Git-Tag: v4.2.3~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd8c764afe8aaeaa3426de414453fa245ff4ff1e;p=thirdparty%2Ftvheadend.git

m3u: fix m3u-url decoding (2nd try), fixes #4432
---

diff --git a/src/misc/m3u.c b/src/misc/m3u.c
index 076fa2f96..18783efe4 100644
--- a/src/misc/m3u.c
+++ b/src/misc/m3u.c
@@ -102,10 +102,17 @@ static const char *get_url
     return rel;
 
   url2 = strdupa(url);
-  p = strchr(url2 + l, '/');
-  if (p == NULL)
-    return rel;
-  *(p + (rel[0] == '/' ? 0 : 1)) = '\0';
+  if (rel[0] == '/') {
+    p = strchr(url2 + l, '/');
+    if (p == NULL)
+      return rel;
+    *p = '\0';
+  } else {
+    p = strrchr(url2 + l, '/');
+    if (p == NULL)
+      return rel;
+    *(p + 1) = '\0';
+  }
   snprintf(buf, buflen, "%s%s", url2, rel);
   return buf;
 }