videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/jpeg2000dec: Fix division by zero in jp2_find_codestream() 

Fixes: 2707/clusterfuzz-testcase-minimized-5179636394754048

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-07-24 16:43:24 +02:00
parent 74c1c22d7f
commit 1b00600319
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/jpeg2000dec.c
View File

@ -2075,6 +2075,11 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
hden = bytestream2_get_be16u(&s->g);
vexp = bytestream2_get_byteu(&s->g);
hexp = bytestream2_get_byteu(&s->g);
if (!vnum || !vden || !hnum || !vden) {
bytestream2_seek(&s->g, atom2_end, SEEK_SET);
av_log(s->avctx, AV_LOG_WARNING, "RES box invalid\n");
continue;
}
if (vexp > hexp) {
vexp -= hexp;
hexp = 0;