From 493cd866f1d8c26b69c603524f2d69ecde68f8ed Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 19 Oct 2014 00:50:52 +0200 Subject: [PATCH] TextInputStream: manually shift the buffer before reading Fixes truncated lines in m3u and cue files (regression by commit 67958f7). --- NEWS | 1 + src/input/TextInputStream.cxx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index e5e1323f4..773055d32 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.19.1 (not yet released) - mms: fix deadlock bug * playlist - extm3u: fix Extended M3U detection + - m3u, extm3u, cue: fix truncated lines * fix build failure on Mac OS X * add missing file systemd/mpd.socket to tarball diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx index c23616782..b79f64bdc 100644 --- a/src/input/TextInputStream.cxx +++ b/src/input/TextInputStream.cxx @@ -33,6 +33,8 @@ TextInputStream::ReadLine() if (line != nullptr) return line; + buffer.Shift(); + while (true) { auto dest = buffer.Write(); if (dest.size < 2) {