Merge branch 'v0.20.x'

2017-04-24 11:44:27 +02:00
parent 45fbafae94 7b7fb5acd5
commit f6e428ac22
8 changed files with 12 additions and 9 deletions
--- 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())