diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-09-02 08:32:24 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-09-02 09:39:32 +0200 |
| commit | c93874c3a8f820312e1e8655bac9c6441589120f (patch) | |
| tree | 86c2b6dcb4ef74d77ab9c226fcb05c50d538e095 | |
| parent | e27fab0e6ee045a0f7e3e77fcbb54c8293a172a6 (diff) | |
| download | ffmpeg-c93874c3a8f820312e1e8655bac9c6441589120f.tar.gz | |
Avoid a deadlock when decoding wma.
Fixes ticket #2925.
(cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4)
| -rw-r--r-- | libavcodec/wmadec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 613a434ab1..7de87dbcd8 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -514,6 +514,10 @@ static int wma_decode_block(WMACodecContext *s) coef escape coding */ total_gain = 1; for(;;) { + if (get_bits_left(&s->gb) < 7) { + av_log(s->avctx, AV_LOG_ERROR, "total_gain overread\n"); + return AVERROR_INVALIDDATA; + } a = get_bits(&s->gb, 7); total_gain += a; if (a != 127) |