[FFmpeg-cvslog] Do not decode RV30 files if the extradata is too small

[Rafaël Carré]

ffmpeg | branch: release/0.6 | Rafaël Carré <rafael.carre at gmail.com> | Sat Jul 16 11:41:08 2011 -0400| [0facc63ff6176a8d70280e8f7da26f77be81ee36] | committer: Reinhard Tartler

Do not decode RV30 files if the extradata is too small

Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac)

Signed-off-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

 libavcodec/rv30.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 22a5dd5..215ef35 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -256,6 +256,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
     if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){
         av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n",
                6 + r->rpr * 2, avctx->extradata_size);
+        return EINVAL;
     }
     r->parse_slice_header = rv30_parse_slice_header;
     r->decode_intra_types = rv30_decode_intra_types;