ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Fri Oct 3 22:50:45 2014 +0200| [a331e11906b196c9a00f5ffbc45d80fcd7fe8423] | committer: Anton Khirnov
smc: fix the bounds check Fixes invalid writes when there are more blocks in a run than total remaining blocks. CC: libav-sta...@libav.org Bug-ID: CVE-2014-8548 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <an...@khirnov.net> (cherry picked from commit d423dd72be451462c6fb1cbbe313bed0194001ab) Signed-off-by: Anton Khirnov <an...@khirnov.net> (cherry picked from commit 58dc526ebf722d33bf09275c1241674e0e6b9ef1) Signed-off-by: Anton Khirnov <an...@khirnov.net> (cherry picked from commit f249e9889155599ee3ad0172832d38f68b0c625d) Signed-off-by: Anton Khirnov <an...@khirnov.net> (cherry picked from commit 306ee95088243fefa2dfcb5c355d439db75e2d2a) Signed-off-by: Anton Khirnov <an...@khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a331e11906b196c9a00f5ffbc45d80fcd7fe8423 --- libavcodec/smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 2bd3176..257d5da 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -69,7 +69,7 @@ typedef struct SmcContext { row_ptr += stride * 4; \ } \ total_blocks--; \ - if (total_blocks < 0) \ + if (total_blocks < !!n_blocks) \ { \ av_log(s->avctx, AV_LOG_INFO, "warning: block counter just went negative (this should not happen)\n"); \ return; \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
