diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-14 18:54:40 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 03:13:11 +0300 |
| commit | 36bc9519b6a62456129d1fed92e93e8fd3330933 (patch) | |
| tree | 9940680250db5380d856b9aaaf0d8b76d39deb40 | |
| parent | 136bd71f690fa78954475904e54e702925cca866 (diff) | |
avcodec/cavsdec: Check esc_code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 139e1c8009df7729a53eaaae7036ca01071aced5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/cavsdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 0212a21655..2264cb46a4 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -568,6 +568,11 @@ static int decode_residual_block(AVSContext *h, GetBitContext *gb, if(run > 64) return -1; esc_code = get_ue_code(gb, esc_golomb_order); + if (esc_code < 0 || esc_code > 32767) { + av_log(h->avctx, AV_LOG_ERROR, "esc_code invalid\n"); + return AVERROR_INVALIDDATA; + } + level = esc_code + (run > r->max_run ? 1 : r->level_add[run]); while (level > r->inc_limit) r++; |