diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2005-06-04 10:59:36 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2005-06-04 10:59:36 +0000 |
| commit | 58d80c6c849551d62952acda35259d10a40b2638 (patch) | |
| tree | b146a26846884cee13385b0d7bdc7e738863ab0b | |
| parent | 9d0f3c3a83276b0ce886fd6720fc8879f2add1b9 (diff) | |
| download | xine-lib-58d80c6c849551d62952acda35259d10a40b2638.tar.gz xine-lib-58d80c6c849551d62952acda35259d10a40b2638.tar.bz2 | |
AAC frame can't have zero length
CVS patchset: 7602
CVS date: 2005/06/04 10:59:36
| -rw-r--r-- | src/demuxers/demux_aac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index e7895c1eb..9ef717307 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -21,7 +21,7 @@ * This demuxer detects ADIF and ADTS headers in AAC files. * Then it shovels buffer-sized chunks over to the AAC decoder. * - * $Id: demux_aac.c,v 1.8 2005/05/30 12:08:49 jstembridge Exp $ + * $Id: demux_aac.c,v 1.9 2005/06/04 10:59:36 jstembridge Exp $ */ #ifdef HAVE_CONFIG_H @@ -106,7 +106,8 @@ static int open_aac_file(demux_aac_t *this) { lprintf("first frame size %d\n", frame_size); - if ((this->data_start+frame_size < MAX_PREVIEW_SIZE-1) && + if ((frame_size > 0) && + (this->data_start+frame_size < MAX_PREVIEW_SIZE-1) && (peak[this->data_start+frame_size] == 0xff) && ((peak[this->data_start+frame_size+1] & 0xf6) == 0xf0)) { lprintf("found second ADTS header\n"); |