m3u parser: fix regression, fixes #3330

tvheadend · Nov 21, 2015 · f362fd1 · f362fd1
1 parent 0b62719
commit f362fd1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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;