repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Debian version 2.5.2~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
vmdvideo.c
diff --git
a/ffmpeg/libavcodec/vmdvideo.c
b/ffmpeg/libavcodec/vmdvideo.c
index fa0fbe32d4ac37ca5f4ec8a9c3c47548c5d1a3bb..a2ba1c959b000e9061e2a8cec466ea68a2ddcfee 100644
(file)
--- a/
ffmpeg/libavcodec/vmdvideo.c
+++ b/
ffmpeg/libavcodec/vmdvideo.c
@@
-339,6
+339,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;
}