virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/jpeg2000dec: Check PPx / PPy values

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-24 22:58:58 +02:00
parent 08724da976
commit 2d8bf3d126
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/jpeg2000dec.c
View File

@@ -461,6 +461,13 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
byte = bytestream2_get_byte(&s->g); byte = bytestream2_get_byte(&s->g);
c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx
c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy
if (i)
if (c->log2_prec_widths[i] == 0 || c->log2_prec_heights[i] == 0) {
av_log(s->avctx, AV_LOG_ERROR, "PPx %d PPy %d invalid\n",
c->log2_prec_widths[i], c->log2_prec_heights[i]);
c->log2_prec_widths[i] = c->log2_prec_heights[i] = 1;
return AVERROR_INVALIDDATA;
}
} }
} else { } else {
memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths )); memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths ));