oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

faad: converted length check to assertion in adts_check_frame()

Browse Source 
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.
This commit is contained in:
Max Kellermann 2009-02-17 19:28:11 +01:00
parent 8edd407918
commit 66b4a3ab2e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/decoder/faad_plugin.c
View File

@ -95,8 +95,7 @@ static const unsigned adts_sample_rates[] =
static size_t static size_t
adts_check_frame(struct faad_buffer *b) adts_check_frame(struct faad_buffer *b)
{ {
if (b->length <= 7) assert(b->length >= 8);
return 0;
/* check syncword */ /* check syncword */
if (!((b->data[0] == 0xFF) && ((b->data[1] & 0xF6) == 0xF0))) 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) if (p > b->data)
faad_buffer_shift(b, p - b->data); faad_buffer_shift(b, p - b->data);
if (b->length <= 7) if (b->length < 8)
/* not enough data yet */ /* not enough data yet */
return 0; return 0;