RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/jpeg2000dec: add some sanity checking on newpasses

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

2
libavcodec/jpeg2000.h
View File

@ -71,6 +71,8 @@ enum Jpeg2000Quantsty { // quantization style
#define JPEG2000_MAX_DECLEVELS 32 #define JPEG2000_MAX_DECLEVELS 32
#define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1) #define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1)
#define JPEG2000_MAX_PASSES 100
// T1 flags // T1 flags
// flags determining significance of neighbor coefficients // flags determining significance of neighbor coefficients
#define JPEG2000_T1_SIG_N 0x0001 #define JPEG2000_T1_SIG_N 0x0001

5
libavcodec/jpeg2000dec.c
View File

@ -805,6 +805,11 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
} }
if ((newpasses = getnpasses(s)) < 0) if ((newpasses = getnpasses(s)) < 0)
return newpasses; return newpasses;
av_assert2(newpasses > 0);
if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) {
avpriv_request_sample(s->avctx, "Too many passes\n");
return AVERROR_PATCHWELCOME;
}
if ((llen = getlblockinc(s)) < 0) if ((llen = getlblockinc(s)) < 0)
return llen; return llen;
if (cblk->lblock + llen + av_log2(newpasses) > 16) { if (cblk->lblock + llen + av_log2(newpasses) > 16) {