jvdec: stop reading partial palette

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago · 1c638cfc25
parent c673a90b0d
commit 1c638cfc25
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@ -174,8 +174,8 @@ static int decode_frame(AVCodecContext *avctx,
        }
    }

-    if (buf < buf_end) {
-        for (i = 0; i < AVPALETTE_COUNT && buf + 3 <= buf_end; i++) {
+    if (buf_end - buf >= AVPALETTE_COUNT * 3) {
+        for (i = 0; i < AVPALETTE_COUNT; i++) {
            uint32_t pal = AV_RB24(buf);
            s->palette[i] = 0xFF << 24 | pal << 2 | ((pal >> 4) & 0x30303);
            buf += 3;