[FFmpeg-cvslog] wmavoice: Check for out of bound writes

[Laurent Aimar]

ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Tue Sep 27 22:15:31 2011 +0000| [95605595b57e8fdfd9fdc591766b8286dd017ee4] | committer: Reinhard Tartler

wmavoice: Check for out of bound writes

Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 1c1449b548a2a0bf0295a522051b04107286653c)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95605595b57e8fdfd9fdc591766b8286dd017ee4
---

 libavcodec/wmavoice.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index eb3bcb0..9537616 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -1880,6 +1880,8 @@ static void copy_bits(PutBitContext *pb,
     rmn_bits = rmn_bytes = get_bits_left(gb);
     if (rmn_bits < nbits)
         return;
+    if (nbits > pb->size_in_bits - put_bits_count(pb))
+        return;
     rmn_bits &= 7; rmn_bytes >>= 3;
     if ((rmn_bits = FFMIN(rmn_bits, nbits)) > 0)
         put_bits(pb, rmn_bits, get_bits(gb, rmn_bits));