[FFmpeg-cvslog] Check for out of bound writes in the wmavoice decoder.

Laurent Aimar git at videolan.org
Sat Oct 1 21:38:52 CEST 2011


ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Tue Sep 27 23:43:51 2011 +0200| [70727e16ca6840873145332bc16c0cfab1a3cdd5] | committer: Michael Niedermayer

Check for out of bound writes in the wmavoice decoder.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e09ae22ab7d9af7f1cbfd2445fa71ad9e7c28ee3)

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

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

diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 002c529..6cefb9a 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));



More information about the ffmpeg-cvslog mailing list