decoder/pcm: fix potential assertion failure in FillBuffer()

After a seek failure, the buffer may still be full, and then FillBuffer() aborts with assertion failure.

decoder/pcm: fix potential assertion failure in FillBuffer()
7b7fb5ac · Max Kellermann · 0a7d612f · 7b7fb5ac
Commit 7b7fb5ac authored Apr 24, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

PcmDecoderPlugin.cxx src/decoder/plugins/PcmDecoderPlugin.cxx +2 -1

No files found.
--- a/src/decoder/plugins/PcmDecoderPlugin.cxx
+++ b/src/decoder/plugins/PcmDecoderPlugin.cxx
@@ -43,7 +43,8 @@ FillBuffer(DecoderClient &client, InputStream &is, B &buffer)
 {
 	buffer.Shift();
 	auto w = buffer.Write();
-	assert(!w.IsEmpty());
+	if (w.IsEmpty())
+		return true;

 	size_t nbytes = decoder_read(client, is, w.data, w.size);
 	if (nbytes == 0 && is.LockIsEOF())