[FFmpeg-cvslog] init_get_bits8: check byte_size against being positive

Michael Niedermayer git at videolan.org
Sun Jan 20 01:12:07 CET 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 16:22:41 2013 +0100| [bd531038e8affa6387d2d7dadd20d907e5791ab5] | committer: Michael Niedermayer

init_get_bits8: check byte_size against being positive

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

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

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

 libavcodec/get_bits.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index af7e156..1946c78 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -406,7 +406,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
 static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer,
                                  int byte_size)
 {
-    if (byte_size > INT_MAX / 8)
+    if (byte_size > INT_MAX / 8 || byte_size < 0)
         return AVERROR_INVALIDDATA;
     return init_get_bits(s, buffer, byte_size * 8);
 }



More information about the ffmpeg-cvslog mailing list