avcodec/smc: fix off by 1 error
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 20:50:45 +0000 (22:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 23:47:05 +0000 (00:47 +0100)
Fixes out of array access
Fixes: asan_heap-oob_1685bf0_5_asan_heap-oob_1f35116_430_smc.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c727401aa9d62335e89d118a5b4e202edf39d905)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/smc.c

index fddd5ab..ff185fb 100644 (file)
@@ -68,7 +68,7 @@ typedef struct SmcContext {
         row_ptr += stride * 4; \
     } \
     total_blocks--; \
-    if (total_blocks < 0) \
+    if (total_blocks < 0 + !!n_blocks) \
     { \
         av_log(s->avctx, AV_LOG_INFO, "warning: block counter just went negative (this should not happen)\n"); \
         return; \