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

avcodec/mjpegdec: sanity check bits 

Fixes undefined shift
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-12 00:25:47 +02:00
parent 903156aa8a
commit 0db1f2c2c7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@ -256,6 +256,11 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->avctx->bits_per_raw_sample = s->avctx->bits_per_raw_sample =
bits = get_bits(&s->gb, 8); bits = get_bits(&s->gb, 8);
if (bits > 16 || bits < 1) {
av_log(s->avctx, AV_LOG_ERROR, "bits %d is invalid\n", bits);
return AVERROR_INVALIDDATA;
}
if (s->pegasus_rct) if (s->pegasus_rct)
bits = 9; bits = 9;
if (bits == 9 && !s->pegasus_rct) if (bits == 9 && !s->pegasus_rct)