Avoid a deadlock when decoding wma.

Fixes ticket #2925.

Avoid a deadlock when decoding wma.
Fixes ticket #2925.
ec8a4841 · Carl Eugen Hoyos · cdd5df81 · ec8a4841
Commit ec8a4841 authored Sep 02, 2013 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

wmadec.c libavcodec/wmadec.c +4 -0

No files found.
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -512,6 +512,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)