har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

See: 884efd4e09696b201457feebdef684aee30be99d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-13 10:36:59 +02:00
commit 43dec5ef9a
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/indeo4.c
View File

@ -284,7 +284,6 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
{ {
int plane, band_num, indx, transform_id, scan_indx; int plane, band_num, indx, transform_id, scan_indx;
int i; int i;
int quant_mat;
plane = get_bits(&ctx->gb, 2); plane = get_bits(&ctx->gb, 2);
band_num = get_bits(&ctx->gb, 4); band_num = get_bits(&ctx->gb, 4);
@ -383,17 +382,18 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
band->scan = scan_index_to_tab[scan_indx]; band->scan = scan_index_to_tab[scan_indx];
band->scan_size = band->blk_size; band->scan_size = band->blk_size;
quant_mat = get_bits(&ctx->gb, 5); band->quant_mat = get_bits(&ctx->gb, 5);
if (quant_mat == 31) { if (band->quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) {
av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n");
return AVERROR_INVALIDDATA; if (band->quant_mat == 31)
} av_log(avctx, AV_LOG_ERROR,
if (quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) { "Custom quant matrix encountered!\n");
else
avpriv_request_sample(avctx, "Quantization matrix %d", avpriv_request_sample(avctx, "Quantization matrix %d",
quant_mat); band->quant_mat);
band->quant_mat = -1;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
band->quant_mat = quant_mat;
} else { } else {
if (old_blk_size != band->blk_size) { if (old_blk_size != band->blk_size) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@ -401,6 +401,10 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
"inherited\n"); "inherited\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (band->quant_mat < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid quant_mat inherited\n");
return AVERROR_INVALIDDATA;
}
} }
if (quant_index_to_tab[band->quant_mat] > 4 && band->blk_size == 4) { if (quant_index_to_tab[band->quant_mat] > 4 && band->blk_size == 4) {
av_log(avctx, AV_LOG_ERROR, "Invalid quant matrix for 4x4 block encountered!\n"); av_log(avctx, AV_LOG_ERROR, "Invalid quant matrix for 4x4 block encountered!\n");