diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 02:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 03:40:58 +0200 |
| commit | e13e928baa6b92ca3e967651550b11dc0bfaad27 (patch) | |
| tree | b2d070bdb1c3a2edd4236d144fe89336f633abce | |
| parent | d3bfb66a6665de9d89760b70411d53d10e0c7ba1 (diff) | |
| download | ffmpeg-e13e928baa6b92ca3e967651550b11dc0bfaad27.tar.gz | |
avcodec/snow: check coeffs for validity
Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 596636a474ab201badaae269f3a2cef4824b8c1f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/snow.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 2cda5b323d..b890d3f176 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -659,7 +659,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, i if(v){ v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]); - + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } xc->x=x; (xc++)->coeff= v; } @@ -669,6 +672,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, i else run= INT_MAX; v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } xc->x=x; (xc++)->coeff= v; |