avcodec/utils: Add case for jv to avcodec_align_dimensions2()

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>
Gbp-Pq: Name CVE-2014-8542.patch

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ba29f6352ab91da68ae68a8cf4783ca17e76a876..5a3e95284bb53ebf3dd31056816e1d14aa0076b1 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -254,6 +254,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
             w_align = 4;
             h_align = 4;
         }
+        if (s->codec_id == AV_CODEC_ID_JV) {
+            w_align = 8;
+            h_align = 8;
+        }
         break;
     case AV_PIX_FMT_BGR24:
         if ((s->codec_id == AV_CODEC_ID_MSZH) ||