[FFmpeg-cvslog] avutil/lzo: add asserts to be double sure against overflows

Michael Niedermayer git at videolan.org
Wed Jun 25 23:15:33 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 14:45:47 2014 +0200| [574bf2ce4ccd4f1a9ca054d5d6a6affe6c507387] | committer: Michael Niedermayer

avutil/lzo: add asserts to be double sure against overflows

These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee

Based-on: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8)

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

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

 libavutil/lzo.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index 82dba94..6104fc3 100644
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "avutil.h"
+#include "avassert.h"
 #include "common.h"
 #include "intreadwrite.h"
 #include "lzo.h"
@@ -85,6 +86,7 @@ static inline void copy(LZOContext *c, int cnt)
 {
     register const uint8_t *src = c->in;
     register uint8_t *dst       = c->out;
+    av_assert0(cnt >= 0);
     if (cnt > c->in_end - src) {
         cnt       = FFMAX(c->in_end - src, 0);
         c->error |= AV_LZO_INPUT_DEPLETED;
@@ -116,6 +118,7 @@ static inline void copy(LZOContext *c, int cnt)
 static inline void copy_backptr(LZOContext *c, int back, int cnt)
 {
     register uint8_t *dst       = c->out;
+    av_assert0(cnt > 0);
     if (dst - c->out_start < back) {
         c->error |= AV_LZO_INVALID_BACKPTR;
         return;



More information about the ffmpeg-cvslog mailing list