diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-03 04:30:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-12-21 04:40:03 +0100 |
| commit | 37800352bba2c46401995d9f5c82791809a78646 (patch) | |
| tree | f44a2619dd93a4ffbd2a463e00cb1569eafb4617 | |
| parent | 29abba35723ad6ce481dfe277dad6d0575f2dbb6 (diff) | |
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 <[email protected]>
(cherry picked from commit 105654e376a736d243aef4a1d121abebce912e6b)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4bf0392687..4163349d61 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -263,6 +263,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) || |