8bps: Make the bound-checks consistent

6fd221e5 · Luca Barbato · bd7b4da0 · 6fd221e5
Commit 6fd221e5 authored Jul 23, 2013 by Luca Barbato
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

8bps.c libavcodec/8bps.c +2 -2

No files found.
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -105,7 +105,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
                if ((count = *dp++) <= 127) {
                    count++;
                    dlen -= count + 1;
-                    if (pixptr + count * px_inc > pixptr_end)
+                    if (pixptr_end - pixptr < count * px_inc)
                        break;
                    if (ep - dp < count)
                        return AVERROR_INVALIDDATA;
@@ -115,7 +115,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
                    }
                } else {
                    count = 257 - count;
-                    if (pixptr + count * px_inc > pixptr_end)
+                    if (pixptr_end - pixptr < count * px_inc)
                        break;
                    while (count--) {
                        *pixptr = *dp;