avformat/aiffdec: only read codec tag when there is space in header

Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg · Jan 5, 2015 · f1098eb · f1098eb
1 parent ce1e10a
commit f1098eb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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) {