Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-02 10:32:24 +0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-02 10:32:24 +0400
commitec8a4841f7e81040f9a2757f23e70dff5e6b33a4 (patch)
tree781824d1aa3331c744f27e398322428d1ea73959 /libavcodec/wmadec.c
parentcdd5df8189ff1537f7abe8defe971f80602cc2d2 (diff)
Avoid a deadlock when decoding wma.
Fixes ticket #2925.
Diffstat (limited to 'libavcodec/wmadec.c')
-rw-r--r--libavcodec/wmadec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index d46eb33c41..8fc0cca807 100644
--- 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)