[FFmpeg-cvslog] sanm: Check decoded_size.
Michael Niedermayer
git at videolan.org
Tue Feb 5 17:01:15 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 24 00:27:10 2013 +0100| [62c9beda0c189db5cb61fa772057e3af9521f293] | committer: Michael Niedermayer
sanm: Check decoded_size.
This prevents a buffer overflow in rle_decode()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7357ca900efcf829de4cce4cec6ddc286526d417)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62c9beda0c189db5cb61fa772057e3af9521f293
---
libavcodec/sanm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index ff70f20..0f68e1d 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -639,6 +639,11 @@ static int old_codec47(SANMVideoContext *ctx, int top,
decoded_size = bytestream2_get_le32(&ctx->gb);
bytestream2_skip(&ctx->gb, 8);
+ if (decoded_size > height * stride - left - top * stride) {
+ decoded_size = height * stride - left - top * stride;
+ av_log(ctx->avctx, AV_LOG_WARNING, "decoded size is too large\n");
+ }
+
if (skip & 1)
bytestream2_skip(&ctx->gb, 0x8080);
if (!seq) {
More information about the ffmpeg-cvslog
mailing list