decoder/mp4ff: work around assertion failure in read() callback

This workaround leads to an infinite loop instead of an assertion failure, but hey, now it's libmp4ff's fault.

decoder/mp4ff: work around assertion failure in read() callback
533e4fcd · Max Kellermann · f5d38592 · 533e4fcd
Commit 533e4fcd authored Dec 13, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mp4ff_decoder_plugin.c src/decoder/mp4ff_decoder_plugin.c +6 -0

No files found.
--- a/src/decoder/mp4ff_decoder_plugin.c
+++ b/src/decoder/mp4ff_decoder_plugin.c
@@ -94,6 +94,12 @@ mp4_read(void *user_data, void *buffer, uint32_t length)
 {
 	struct mp4ff_input_stream *mis = user_data;

+	if (length == 0)
+		/* libmp4ff is known to attempt to read 0 bytes - make
+		   this a special case, because the input_stream API
+		   would not allow this */
+		return 0;
+
 	return decoder_read(mis->decoder, mis->input_stream, buffer, length);
 }