mirror of https://git.ffmpeg.org/ffmpeg.git
8bps: Make the bound-checks consistent
This commit is contained in:
parent
bd7b4da0f4
commit
6fd221e5f8
|
@ -105,7 +105,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||||
if ((count = *dp++) <= 127) {
|
if ((count = *dp++) <= 127) {
|
||||||
count++;
|
count++;
|
||||||
dlen -= count + 1;
|
dlen -= count + 1;
|
||||||
if (pixptr + count * px_inc > pixptr_end)
|
if (pixptr_end - pixptr < count * px_inc)
|
||||||
break;
|
break;
|
||||||
if (ep - dp < count)
|
if (ep - dp < count)
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
@ -115,7 +115,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
count = 257 - count;
|
count = 257 - count;
|
||||||
if (pixptr + count * px_inc > pixptr_end)
|
if (pixptr_end - pixptr < count * px_inc)
|
||||||
break;
|
break;
|
||||||
while (count--) {
|
while (count--) {
|
||||||
*pixptr = *dp;
|
*pixptr = *dp;
|
||||||
|
|
Loading…
Reference in New Issue