diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 04:30:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:44:38 +0100 |
| commit | b5298c464f0519b1f7e51f4513021fd004486543 (patch) | |
| tree | 93fbc28af26ea4b1fd96da133adfdba9a7dc6f50 | |
| parent | 9ec550c364835caaa928c361d009b75f25d774a9 (diff) | |
| download | ffmpeg-b5298c464f0519b1f7e51f4513021fd004486543.tar.gz | |
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>
(cherry picked from commit 105654e376a736d243aef4a1d121abebce912e6b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 8b50c45d66..46c0745680 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -358,6 +358,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) || |