diff options
| author | Max Kellermann <max@duempel.org> | 2014-10-17 20:45:18 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-17 20:45:18 +0200 |
| commit | a0fae8dacc3361374990973e1a9d9e4d8961d360 (patch) | |
| tree | 6456e34cd464c7a55e0e66a8e250e16c7ca6306b | |
| parent | bc840b69d51538f966d8d4800cb0ab460169971c (diff) | |
| download | mpd-a0fae8dacc3361374990973e1a9d9e4d8961d360.tar.gz mpd-a0fae8dacc3361374990973e1a9d9e4d8961d360.tar.xz mpd-a0fae8dacc3361374990973e1a9d9e4d8961d360.zip | |
playlist/extm3u: strip first line for #EXTM3U detection
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/playlist/plugins/ExtM3uPlaylistPlugin.cxx | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -1,6 +1,8 @@ ver 0.19.1 (not yet released) * input - mms: fix deadlock bug +* playlist + - extm3u: fix Extended M3U detection * fix build failure on Mac OS X * add missing file systemd/mpd.socket to tarball diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx index b459696f1..fdd4357ca 100644 --- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx @@ -39,8 +39,12 @@ public: } bool CheckFirstLine() { - const char *line = tis.ReadLine(); - return line != nullptr && strcmp(line, "#EXTM3U") == 0; + char *line = tis.ReadLine(); + if (line == nullptr) + return false; + + StripRight(line); + return strcmp(line, "#EXTM3U") == 0; } virtual DetachedSong *NextSong() override; |