diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 11:19:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 11:37:09 +0200 |
commit | 3e33db3f652e019c18f5b4c5247396dd18f9a15a (patch) | |
tree | 94de682d8863ca44119edc2db4f80562fc01e4cc /libavcodec | |
parent | c1343897c3c879d8842f06220dd1019fd4f8baf7 (diff) | |
parent | e30b068ef79f604ff439418da07f7e2efd01d4ea (diff) | |
download | ffmpeg-3e33db3f652e019c18f5b4c5247396dd18f9a15a.tar.gz |
Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'
* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
wmapro: make sure there is room to store the current packet
The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/wmaprodec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index a71a67e12d..580b7b454b 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1469,6 +1469,8 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len, return; } + av_assert0(len <= put_bits_left(&s->pb)); + s->num_saved_bits += len; if (!append) { avpriv_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3), |