RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-14 11:14:44 +00:00
Code Issues Projects Releases Wiki Activity

mjpegdec: check h/v_count.

Browse Source 
Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-23 10:23:52 +01:00
parent 46c7842994
commit 08c37a10e9
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/mjpegdec.c
View File

@ -275,6 +275,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->h_max = s->h_count[i]; s->h_max = s->h_count[i];
if (s->v_count[i] > s->v_max) if (s->v_count[i] > s->v_max)
s->v_max = s->v_count[i]; s->v_max = s->v_count[i];
if (!s->h_count[i] || !s->v_count[i]) {
av_log(s->avctx, AV_LOG_ERROR, "h/v_count is 0\n");
return -1;
}
s->quant_index[i] = get_bits(&s->gb, 8); s->quant_index[i] = get_bits(&s->gb, 8);
if (s->quant_index[i] >= 4) if (s->quant_index[i] >= 4)
return -1; return -1;