[FFmpeg-devel] [PATCH] targadec: Simplify RLE out of packet check.
Michael Niedermayer
michaelni at gmx.at
Sat Jan 21 04:42:02 CET 2012
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
libavcodec/targa.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 56e02c1..573992f 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -55,7 +55,7 @@ static int targa_decode_rle(AVCodecContext *avctx, TargaContext *s, const uint8_
type = *src++;
count = (type & 0x7F) + 1;
type &= 0x80;
- if((x + count > w) && (x + count + 1 > (h - y) * w)){
+ if(x + count > (h - y) * w){
av_log(avctx, AV_LOG_ERROR, "Packet went out of bounds: position (%i,%i) size %i\n", x, y, count);
return -1;
}
--
1.7.5.4
More information about the ffmpeg-devel
mailing list