RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 105654e376)

Conflicts:

	libavcodec/utils.c
This commit is contained in:
Michael Niedermayer 2014-10-03 04:30:58 +02:00
parent bb6a8a0509
commit bd3a28e8b6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@ -222,6 +222,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
w_align=4; w_align=4;
h_align=4; h_align=4;
} }
if (s->codec_id == CODEC_ID_JV) {
w_align = 8;
h_align = 8;
}
break; break;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){ if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){