avcodec/utils: Add case for jv to avcodec_align_dimensions2()
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 02:30:58 +0000 (04:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 17:03:48 +0000 (18:03 +0100)
Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv

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

Conflicts:

libavcodec/utils.c

libavcodec/utils.c

index 6ecdfeb..7cfb96d 100644 (file)
@@ -222,6 +222,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
             w_align=4;
             h_align=4;
         }
+        if (s->codec_id == CODEC_ID_JV) {
+            w_align = 8;
+            h_align = 8;
+        }
         break;
     case PIX_FMT_BGR24:
         if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){