From f1098eb97d3c15640d3473aeba97e2be22ee0d54 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Mon, 5 Jan 2015 08:44:06 +1100 Subject: avformat/aiffdec: only read codec tag when there is space in header Signed-off-by: Peter Ross Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 91ef2a4d10..8dbed327b6 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -116,10 +116,12 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, size -= 18; /* get codec id for AIFF-C */ - if (version == AIFF_C_VERSION1) { + if (version == AIFF_C_VERSION1 && size >= 4) { codec->codec_tag = avio_rl32(pb); codec->codec_id = ff_codec_get_id(ff_codec_aiff_tags, codec->codec_tag); size -= 4; + } else { + version = AIFF; } if (version != AIFF_C_VERSION1 || codec->codec_id == AV_CODEC_ID_PCM_S16BE) { -- cgit v1.2.3