highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/jpeg2000dec: Add some additional checking on lengthinc

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-12 01:13:55 +02:00
parent 2f1dd4a3d1
commit 5ccca4eb8e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/jpeg2000dec.c
View File

@@ -807,6 +807,12 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
return newpasses; return newpasses;
if ((llen = getlblockinc(s)) < 0) if ((llen = getlblockinc(s)) < 0)
return llen; return llen;
if (cblk->lblock + llen + av_log2(newpasses) > 16) {
avpriv_request_sample(s->avctx,
"Block with length beyond 16 bits\n");
return AVERROR_PATCHWELCOME;
}
cblk->lblock += llen; cblk->lblock += llen;
if ((ret = get_bits(s, av_log2(newpasses) + cblk->lblock)) < 0) if ((ret = get_bits(s, av_log2(newpasses) + cblk->lblock)) < 0)
return ret; return ret;