virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'

Browse Source 
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
	libavcodec/aic.c

See: 657875b145
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-12 14:33:25 +02:00
parent 83d2b7e9a2 0f678c0214
commit 72abfba884
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aic.c
View File

@@ -223,7 +223,7 @@ static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
break; break;
GET_CODE(val, coeff_type, coeff_bits); GET_CODE(val, coeff_type, coeff_bits);
val++; val++;
if (val >= 0x10000) if (val >= 0x10000 || val < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
dst[scan[idx]] = val; dst[scan[idx]] = val;
} while (idx < num_coeffs - 1); } while (idx < num_coeffs - 1);
@@ -233,7 +233,7 @@ static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
for (mb = 0; mb < slice_width; mb++) { for (mb = 0; mb < slice_width; mb++) {
for (idx = 0; idx < num_coeffs; idx++) { for (idx = 0; idx < num_coeffs; idx++) {
GET_CODE(val, coeff_type, coeff_bits); GET_CODE(val, coeff_type, coeff_bits);
if (val >= 0x10000) if (val >= 0x10000 || val < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
dst[scan[idx]] = val; dst[scan[idx]] = val;
} }