From 01d376f598fe95478036f5d1e3e5e14ffe32d4bf Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 9 Apr 2013 20:33:25 +0200
Subject: [PATCH] rv10: check that extradata is large enough
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
---
libavcodec/rv10.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 789847da828..e4003a3ffbd 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -346,6 +346,11 @@ static int rv20_decode_picture_header(RVDecContext *rv)
f = get_bits(&s->gb, rpr_bits);
if (f) {
+ if (s->avctx->extradata_size < 8 + 2 * f) {
+ av_log(s->avctx, AV_LOG_ERROR, "Extradata too small.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
new_w = 4 * ((uint8_t*)s->avctx->extradata)[6 + 2 * f];
new_h = 4 * ((uint8_t*)s->avctx->extradata)[7 + 2 * f];
} else {
--
GitLab