From 83de4f5fc92b1424c7d77f3411572a9a00eff672 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 28 May 2012 15:58:46 +0200
Subject: [PATCH] Test extradata size before reading from extradata when
decoding avui.
---
libavcodec/avuidec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c
index a1beb37e805..32fd819ea75 100644
--- 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;
--
GitLab