summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <[email protected]>2011-07-16 11:41:08 -0400
committerReinhard Tartler <[email protected]>2011-09-26 19:26:29 +0200
commit3ed12b97bed7f0cd430c4304f166e549b4dad634 (patch)
treeaa7a6e3f2ead9668534674251562a38c034c1601
parentf7831bb104c48118b38d4ba86a7d594fe4fa0f2c (diff)
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]>
-rw-r--r--libavcodec/rv30.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 62177dda78..2b423cc0d2 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;