[FFmpeg-cvslog] rv10: check that extradata is large enough

[Anton Khirnov]

ffmpeg | branch: release/0.7 | Anton Khirnov <anton at khirnov.net> | Tue Apr  9 20:33:25 2013 +0200| [9b052bfb8609f2279c33dc9aa9fb39d2e7a53ef2] | committer: Reinhard Tartler

rv10: check that extradata is large enough

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable at libav.org

(cherry picked from commit 01d376f598fe95478036f5d1e3e5e14ffe32d4bf)

Conflicts:

	libavcodec/rv10.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b052bfb8609f2279c33dc9aa9fb39d2e7a53ef2
---

 libavcodec/rv10.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 8d5b62f..bd58dec 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -345,6 +345,11 @@ static int rv20_decode_picture_header(MpegEncContext *s)
         f= get_bits(&s->gb, av_log2(v)+1);
 
         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{