targa: prevent integer overflow in bufsize check.
authorRonald S. Bultje <rsbultje@gmail.com>
Mon, 21 Feb 2011 18:44:37 +0000 (13:44 -0500)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Feb 2011 01:44:37 +0000 (02:44 +0100)
(cherry picked from commit 78e2380a6d09e7a8b2a74d090abfb0a922e046f6)

libavcodec/targa.c

index 0892b6f..3c220f4 100644 (file)
@@ -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; \
     } \