From 6987ffa06750d44706ccd4d6e19c3b7ca6694523 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 15 Jun 2017 20:45:34 +0200 Subject: [PATCH] m3u: fix m3u-url decoding (2nd try), fixes #4432 --- src/misc/m3u.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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; } -- 2.47.3