Commit eb3f81e4 authored by Michael Niedermayer's avatar Michael Niedermayer

targadec: Simplify RLE out of packet check.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f9ca1ac7
...@@ -55,7 +55,7 @@ static int targa_decode_rle(AVCodecContext *avctx, TargaContext *s, const uint8_ ...@@ -55,7 +55,7 @@ static int targa_decode_rle(AVCodecContext *avctx, TargaContext *s, const uint8_
type = *src++; type = *src++;
count = (type & 0x7F) + 1; count = (type & 0x7F) + 1;
type &= 0x80; 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); av_log(avctx, AV_LOG_ERROR, "Packet went out of bounds: position (%i,%i) size %i\n", x, y, count);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment