From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 23 Feb 2011 18:11:06 +0000 (-0500)
Subject: vmdaudio: set *data_size to zero when skipping small packets and add a warning log... 
X-Git-Tag: android-x86-4.4-r1~18311
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b4b5e92286bcb16d74520aab6a78e5696ebe6ef1;p=android-x86%2Fexternal-ffmpeg.git

vmdaudio: set *data_size to zero when skipping small packets and add a warning log message.

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

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index b338da3904..1407c96588 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -514,8 +514,11 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
     /* point to the start of the encoded data */
     const unsigned char *p = buf + 16;
 
-    if (buf_size < 16)
+    if (buf_size < 16) {
+        av_log(avctx, AV_LOG_WARNING, "skipping small junk packet\n");
+        *data_size = 0;
         return buf_size;
+    }
 
     block_type = buf[6];
     if (block_type < BLOCK_TYPE_AUDIO || block_type > BLOCK_TYPE_SILENCE) {