decoder/faad: skip assertion failure on large ID3 tags

When the ID3 tag in an AAC file is larger than the current buffer, the function decoder_buffer_consume() aborts. By using the new function decoder_buffer_skip() instead, we can safely skip the ID3 tag.

decoder/faad: skip assertion failure on large ID3 tags
b0f9a145 · Max Kellermann · efb29007 · b0f9a145 · b0f9a145
Commit b0f9a145 authored Sep 30, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

NEWS NEWS +1 -0

faad_plugin.c src/decoder/faad_plugin.c +6 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.4 (2009/??/??)
 * decoders:
  - vorbis: revert "faster tag scanning with ov_test_callback()"
+  - faad: skip assertion failure on large ID3 tags
 * output:
  - osx: fix the OS X 10.6 build


--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -162,6 +162,7 @@ faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is)
 	size_t tagsize;
 	const unsigned char *data;
 	size_t length;
+	bool success;

 	fileread = is->size >= 0 ? is->size : 0;

@@ -179,8 +180,11 @@ faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is)

 		tagsize += 10;

-		decoder_buffer_consume(buffer, tagsize);
-		decoder_buffer_fill(buffer);
+		success = decoder_buffer_skip(buffer, tagsize) &&
+			decoder_buffer_fill(buffer);
+		if (!success)
+			return -1;
+
 		data = decoder_buffer_read(buffer, &length);
 		if (data == NULL)
 			return -1;