faad: converted length check to assertion in adts_check_frame()

adts_check_frame() must not be called with a buffer length smaller than 8. We can eliminate that duplicate check, and convert it into an assertion.

faad: converted length check to assertion in adts_check_frame()
66b4a3ab · Max Kellermann · 8edd4079 · 66b4a3ab
Commit 66b4a3ab authored Feb 17, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -95,8 +95,7 @@ static const unsigned adts_sample_rates[] =
 static size_t
 adts_check_frame(struct faad_buffer *b)
 {
-	if (b->length <= 7)
-		return 0;
+	assert(b->length >= 8);

 	/* check syncword */
 	if (!((b->data[0] == 0xFF) && ((b->data[1] & 0xF6) == 0xF0)))
@@ -122,7 +121,7 @@ adts_find_frame(struct faad_buffer *b)
 		if (p > b->data)
 			faad_buffer_shift(b, p - b->data);

-		if (b->length <= 7)
+		if (b->length < 8)
 			/* not enough data yet */
 			return 0;