diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 04:30:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:48 +0100 |
| commit | bd3a28e8b65cd1bbe550e03bc7647831d4ea3d18 (patch) | |
| tree | 9a682fff5741870438ecd096b23a562adde37fb8 | |
| parent | bb6a8a0509d5fcc93aff6e3c62135ed5f6f9cb25 (diff) | |
| download | ffmpeg-bd3a28e8b65cd1bbe550e03bc7647831d4ea3d18.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)
Conflicts:
libavcodec/utils.c
| -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 6ecdfebbe2..7cfb96d537 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -222,6 +222,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, w_align=4; h_align=4; } + if (s->codec_id == CODEC_ID_JV) { + w_align = 8; + h_align = 8; + } break; case PIX_FMT_BGR24: if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){ |