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:15 +0200 |
| commit | e2c5f88237e74694c56a5954e579de055166f9c6 (patch) | |
| tree | b837cd352f35398ead321da09f131afb45e9c278 | |
| parent | d005e2ecce5c8104679b39f2050a9d83e417d275 (diff) | |
| download | ffmpeg-e2c5f88237e74694c56a5954e579de055166f9c6.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 6771464e90..cb51e48433 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -405,6 +405,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) || |