[FFmpeg-cvslog] Avoid a deadlock when decoding wma.

[Carl Eugen Hoyos]

ffmpeg | branch: release/0.11 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Sep  2 08:32:24 2013 +0200| [a5ef62ede16a3245507f3d596faa45c775603052] | committer: Carl Eugen Hoyos

Avoid a deadlock when decoding wma.

Fixes ticket #2925.
(cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5ef62ede16a3245507f3d596faa45c775603052
---

 libavcodec/wmadec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index f26a143..329150d 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -529,6 +529,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)