ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Sun Jan 1 22:42:44 2017 +0100| [91e6a64d2ea62edbe1178a65a2376e605f6988d5] | committer: Andreas Cadhalpun
wmavoice: truncate spillover_nbits if too large This fixes triggering the av_assert0(ret <= tmp.size). The problem was reintroduced by commit 7b27dd5c16de785297ce4de4b88afa0b6685f61d and originally fixed by 2a4700a4f03280fa8ba4fc0f8a9987bb550f0d1e. Reviewed-by: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91e6a64d2ea62edbe1178a65a2376e605f6988d5 --- libavcodec/wmavoice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index cd5958c..c310b19 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1923,6 +1923,9 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, * continuing to parse new superframes in the current packet. */ if (s->sframe_cache_size > 0) { int cnt = get_bits_count(gb); + if (cnt + s->spillover_nbits > avpkt->size * 8) { + s->spillover_nbits = avpkt->size * 8 - cnt; + } copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); flush_put_bits(&s->pb); s->sframe_cache_size += s->spillover_nbits; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
