Skip to content

F
ffmpeg.wasm-core
Commit 6fd221e5 authored by Luca Barbato's avatar Luca Barbato
Browse files
Options

8bps: Make the bound-checks consistent

parent bd7b4da0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/8bps.c
View file @ 6fd221e5
...@@ -105,7 +105,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, ...@@ -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, ...@@ -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;
......
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