Module: libav
Branch: release/0.7
Commit: 3ed12b97bed7f0cd430c4304f166e549b4dad634

Author:    Rafaël Carré <[email protected]>
Committer: Reinhard Tartler <[email protected]>
Date:      Sat Jul 16 11:41:08 2011 -0400

Do not decode RV30 files if the extradata is too small

Signed-off-by: Diego Biurrun <[email protected]>
(cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac)

Signed-off-by: Anton Khirnov <[email protected]>

---

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

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 62177dd..2b423cc 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to