[FFmpeg-cvslog] avcodec/wmaprodec: Check for overread in decode_packet()
Michael Niedermayer
git at videolan.org
Thu Nov 26 17:00:13 CET 2015
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sun Nov 15 18:18:40 2015 +0100| [b3bc05290acb184c1a022b90437a8b67857e3f3d] | committer: Michael Niedermayer
avcodec/wmaprodec: Check for overread in decode_packet()
Fixes assertion failure
Fixes: 0256e92df2df7e933b43a2c70e4c8040/signal_sigabrt_7ffff6ae7cc9_1358_999ac18684788221490757582ce9af84.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 7ad698e24e6b9dde57c4e01c145bcddfe9d6e4a3)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3bc05290acb184c1a022b90437a8b67857e3f3d
---
libavcodec/wmaprodec.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 19dc335..7f6d3ed 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1623,6 +1623,11 @@ static int decode_packet(AVCodecContext *avctx, void *data,
s->packet_done = 1;
}
+ if (remaining_bits(s, gb) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Overread %d\n", -remaining_bits(s, gb));
+ s->packet_loss = 1;
+ }
+
if (s->packet_done && !s->packet_loss &&
remaining_bits(s, gb) > 0) {
/** save the rest of the data so that it can be decoded
More information about the ffmpeg-cvslog
mailing list