diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-02-23 13:11:06 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-26 03:16:03 +0100 |
| commit | b4b5e92286bcb16d74520aab6a78e5696ebe6ef1 (patch) | |
| tree | de5fb999066bffce4207ba44c0cfdab1b8c9d48b /libavcodec/vmdav.c | |
| parent | ebed7b6865761d0d903757c5121ca2dbfba055dd (diff) | |
| download | ffmpeg-b4b5e92286bcb16d74520aab6a78e5696ebe6ef1.tar.gz | |
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)
Diffstat (limited to 'libavcodec/vmdav.c')
| -rw-r--r-- | libavcodec/vmdav.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |