[FFmpeg-cvslog] targa: prevent integer overflow in bufsize check.

Ronald S. Bultje git
Tue Feb 22 03:17:17 CET 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Mon Feb 21 13:44:37 2011 -0500| [e48fe14a54d8360336dbb22f3f787815b57dda47] | committer: Michael Niedermayer

targa: prevent integer overflow in bufsize check.
(cherry picked from commit 78e2380a6d09e7a8b2a74d090abfb0a922e046f6)

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

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

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 0892b6f..3c220f4 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -34,7 +34,7 @@ typedef struct TargaContext {
 } TargaContext;
 
 #define CHECK_BUFFER_SIZE(buf, buf_end, needed, where) \
-    if(buf + needed > buf_end){ \
+    if(needed > buf_end - buf){ \
         av_log(avctx, AV_LOG_ERROR, "Problem: unexpected end of data while reading " where "\n"); \
         return -1; \
     } \




More information about the ffmpeg-cvslog mailing list