diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 04:30:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 05:07:33 +0200 |
| commit | e90d620cb93eb23a17b8803d8bb164c903633378 (patch) | |
| tree | 38e4cf2fac67f74efb04f44381a17f8916f33d6a | |
| parent | 0ffa44340f247e5d24d006726ecc9c66c55dcf22 (diff) | |
| download | ffmpeg-e90d620cb93eb23a17b8803d8bb164c903633378.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 8acf4c4129..33ff8e0110 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -274,6 +274,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) || |