Merge tag 'n2.1.8' of git://source.ffmpeg.org/ffmpeg into kitkat-x86

[android-x86/external-ffmpeg.git] / libavcodec / vmdav.c

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 36d60ee..8710f33 100644 (file)
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -348,6 +348,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
                         ofs += slen;
                         bytestream2_skip(&gb, len);
                     } else {
+                        if (ofs + len > frame_width ||
+                            bytestream2_get_bytes_left(&gb) < len)
+                            return AVERROR_INVALIDDATA;
                         bytestream2_get_buffer(&gb, &dp[ofs], len);
                         ofs += len;
                     }