diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-10-10 21:02:10 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-01-05 17:21:35 -0500 |
| commit | 1d7a453dcfe4edae7d08aed0bed5ccd993409d42 (patch) | |
| tree | 526931945692d27242bbceb095c069b5459c5091 /libavcodec | |
| parent | 481e55eba7a7942a0497e5bb4191cb1971e19760 (diff) | |
| download | ffmpeg-1d7a453dcfe4edae7d08aed0bed5ccd993409d42.tar.gz | |
prores: Reject negative run and level values
Sample-Id: 00000611-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit c0de9a23c7080e2fac8f879b9d9a0ce2b64ea953)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/proresdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index 4b196f6d32..a47f16e575 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -392,12 +392,16 @@ static inline void decode_ac_coeffs(GetBitContext *gb, DCTELEM *out, return; run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]); + if (run < 0) + return AVERROR_INVALIDDATA; bits_left = get_bits_left(gb); if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) return; level = decode_vlc_codeword(gb, ff_prores_ac_codebook[lev_cb_index]) + 1; + if (level < 0) + return AVERROR_INVALIDDATA; pos += run + 1; if (pos >= max_coeffs) |