aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2011-07-16 11:41:08 -0400
committerReinhard Tartler <siretart@tauware.de>2011-11-05 13:18:32 +0100
commit0facc63ff6176a8d70280e8f7da26f77be81ee36 (patch)
tree3e8127fbb404f992ed2f549786b82d7171b32359
parent5ed9457260cadfcf350ae9aece476e2a5fbc490c (diff)
downloadffmpeg-0facc63ff6176a8d70280e8f7da26f77be81ee36.tar.gz
Do not decode RV30 files if the extradata is too small
Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac) Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavcodec/rv30.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 22a5dd5b64..215ef35414 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;