Module: libav Branch: release/9 Commit: 88433979c21ccaba3581acd397d091f2a50a6028
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Fri Jun 28 04:03:47 2013 +0200 wmapro: make sure there is room to store the current packet Prevent horrid and hard to trace struct overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit e30b068ef79f604ff439418da07f7e2efd01d4ea) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/wmaprodec.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index efc8fce..8fabc3a 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1464,6 +1464,14 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len, return; } + if (len > put_bits_left(&s->pb)) { + av_log(s->avctx, AV_LOG_ERROR, + "Cannot append %d bits, only %d bits available.\n", + len, put_bits_left(&s->pb)); + s->packet_loss = 1; + return; + } + s->num_saved_bits += len; if (!append) { avpriv_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3), _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
