Test extradata size before reading from extradata when decoding avui.

83de4f5f · Carl Eugen Hoyos · d5a17d7f · 83de4f5f
Commit 83de4f5f authored May 28, 2012 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

avuidec.c libavcodec/avuidec.c +2 -2

No files found.
--- a/libavcodec/avuidec.c
+++ b/libavcodec/avuidec.c
@@ -48,8 +48,8 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data,
    if (pic->data[0])
        avctx->release_buffer(avctx, pic);

-    if (!memcmp(&avctx->extradata[4], "APRGAPRG0001", 12) &&
-        avctx->extradata_size >= 24)
+    if (avctx->extradata_size >= 24 &&
+        !memcmp(&avctx->extradata[4], "APRGAPRG0001", 12))
        interlaced = avctx->extradata[19] != 1;
    if (avctx->height == 486) {
        skip = 10;