[FFmpeg-cvslog] put_bits: add av_assert2() to check out of array writes.

Michael Niedermayer git at videolan.org
Sat Apr 7 20:57:11 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  7 15:55:19 2012 +0200| [d3b0fb10485423dccd748ee13796add27664bcf3] | committer: Michael Niedermayer

put_bits: add av_assert2() to check out of array writes.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 132d133..f8046b1 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -142,6 +142,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
 #ifdef BITSTREAM_WRITER_LE
     bit_buf |= value << (32 - bit_left);
     if (n >= bit_left) {
+        av_assert2(s->buf_ptr+3<s->buf_end);
         AV_WL32(s->buf_ptr, bit_buf);
         s->buf_ptr+=4;
         bit_buf = (bit_left==32)?0:value >> bit_left;
@@ -155,6 +156,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
     } else {
         bit_buf<<=bit_left;
         bit_buf |= value >> (n - bit_left);
+        av_assert2(s->buf_ptr+3<s->buf_end);
         AV_WB32(s->buf_ptr, bit_buf);
         //printf("bitbuf = %08x\n", bit_buf);
         s->buf_ptr+=4;



More information about the ffmpeg-cvslog mailing list