From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 23 Feb 2011 18:11:05 +0000 (-0500)
Subject: vmdaudio: validate block type
X-Git-Tag: android-x86-4.4-r1~18312
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ebed7b6865761d0d903757c5121ca2dbfba055dd;p=android-x86%2Fexternal-ffmpeg.git

vmdaudio: validate block type

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180)
---

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index a528d91190..b338da3904 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -518,6 +518,10 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
         return buf_size;
 
     block_type = buf[6];
+    if (block_type < BLOCK_TYPE_AUDIO || block_type > BLOCK_TYPE_SILENCE) {
+        av_log(avctx, AV_LOG_ERROR, "unknown block type: %d\n", block_type);
+        return AVERROR(EINVAL);
+    }
 
     if (block_type == BLOCK_TYPE_AUDIO) {
         /* the chunk contains audio */