From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 21 Nov 2015 16:29:13 +0000 (+0100)
Subject: m3u parser: fix regression, fixes #3330
X-Git-Tag: v4.2.1~1498
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f362fd1f6f939e837ff0362ec1e9a891667695f8;p=thirdparty%2Ftvheadend.git

m3u parser: fix regression, fixes #3330
---

diff --git a/src/misc/m3u.c b/src/misc/m3u.c
index 36383f49f..03d1d8ba4 100644
--- a/src/misc/m3u.c
+++ b/src/misc/m3u.c
@@ -32,17 +32,18 @@ static char *get_m3u_str(char *data, char **res, int *last)
     data++; p++;
     while (*data && *data != first && *data != '\n' && *data != '\r')
       data++;
-  } else {
-    while (*data && *data != ',' && *data > ' ')
+    if (*data == first) {
+      *data = '\0';
       data++;
+    }
   }
+  while (*data && *data != ',' && *data > ' ')
+    data++;
   *last = '\0';
   if (*data) {
     *last = *data;
     *data = '\0';
     data++;
-    while (*last && *data == ',')
-      data++;
   }
   *res = data;
   return p;