flac: decoder command means EOF

It was possible for the decoder thread to go into an endless loop (flac and oggflac decoders): when a "STOP" command arrived, the Read() callback would return 0, but the EOF() callback returned false. Fix: when decoder_get_command()!=NONE, return EOF==true.

flac: decoder command means EOF
6df980a9 · Max Kellermann · 8a510948 · 6df980a9 · 6df980a9
Commit 6df980a9 authored Aug 26, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 11 deletions

flac_plugin.c src/inputPlugins/flac_plugin.c +6 -8

oggflac_plugin.c src/inputPlugins/oggflac_plugin.c +3 -3

No files found.
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -36,16 +36,14 @@ static flac_read_status flacRead(mpd_unused const flac_decoder * flacDec,
 	r = decoder_read(data->decoder, data->inStream, (void *)buf, *bytes);
 	*bytes = r;

-	if (r == 0 && decoder_get_command(data->decoder) == DECODE_COMMAND_NONE) {
-		if (inputStreamAtEOF(data->inStream))
+	if (r == 0) {
+		if (decoder_get_command(data->decoder) != DECODE_COMMAND_NONE ||
+		    inputStreamAtEOF(data->inStream))
 			return flac_read_status_eof;
 		else
 			return flac_read_status_abort;
 	}

-	if (r == 0 && decoder_get_command(data->decoder) == DECODE_COMMAND_SEEK)
-		return flac_read_status_eof;
-
 	return flac_read_status_continue;
 }

@@ -88,9 +86,9 @@ static FLAC__bool flacEOF(mpd_unused const flac_decoder * flacDec, void *fdata)
 {
 	FlacData *data = (FlacData *) fdata;

-	if (inputStreamAtEOF(data->inStream) == 1)
-		return true;
-	return false;
+	return (decoder_get_command(data->decoder) != DECODE_COMMAND_NONE &&
+		decoder_get_command(data->decoder) != DECODE_COMMAND_SEEK) ||
+		inputStreamAtEOF(data->inStream);
 }

 static void flacError(mpd_unused const flac_decoder *dec,

--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -104,9 +104,9 @@ static FLAC__bool of_EOF_cb(const OggFLAC__SeekableStreamDecoder * decoder,
 {
 	FlacData *data = (FlacData *) fdata;

-	if (inputStreamAtEOF(data->inStream) == 1)
-		return true;
-	return false;
+	return (decoder_get_command(data->decoder) != DECODE_COMMAND_NONE &&
+		decoder_get_command(data->decoder) != DECODE_COMMAND_SEEK) ||
+		inputStreamAtEOF(data->inStream);
 }

 static void of_error_cb(const OggFLAC__SeekableStreamDecoder * decoder,