Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'

[ffmpeg] / libavcodec / gdv.c

diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c
index dc91869edf94e4985d85185c4b88f630e951d9fc..e52a637610a54067c6633d79f9a385d79e3dda04 100644 (file)
--- a/libavcodec/gdv.c
+++ b/libavcodec/gdv.c
@@ -409,17 +409,20 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
     unsigned flags;
     uint8_t *dst;
 
-    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
-        return ret;
-    if (pal && pal_size == AVPALETTE_SIZE)
-        memcpy(gdv->pal, pal, AVPALETTE_SIZE);
-
     bytestream2_init(gb, avpkt->data, avpkt->size);
     bytestream2_init_writer(pb, gdv->frame, gdv->frame_size);
 
     flags = bytestream2_get_le32(gb);
     compression = flags & 0xF;
 
+    if (compression == 4 || compression == 7 || compression > 8)
+        return AVERROR_INVALIDDATA;
+
+    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+        return ret;
+    if (pal && pal_size == AVPALETTE_SIZE)
+        memcpy(gdv->pal, pal, AVPALETTE_SIZE);
+
     rescale(gdv, gdv->frame, avctx->width, avctx->height,
             !!(flags & 0x10), !!(flags & 0x20));
 
@@ -451,7 +454,7 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
         ret = decompress_68(avctx, flags >> 8, 1);
         break;
     default:
-        return AVERROR_INVALIDDATA;
+        av_assert0(0);
     }
 
     memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);