aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-19 15:12:06 +0300
committerLuca Barbato <lu_zero@gentoo.org>2013-10-04 03:26:29 +0200
commit97b6916f93e6998ed787e35efc56018f9d390c55 (patch)
tree2202b44a82e76f9fd6f70b947af8dc2f09a7f4e1
parentce1dacb435460dda1f9d453eaaeac44bd502aca4 (diff)
downloadffmpeg-97b6916f93e6998ed787e35efc56018f9d390c55.tar.gz
dcadec: Validate the lfe parameter
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit a9d50bb578ec04c085a25f1e023f75e0e4499d5e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/dcadec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 561c30c003..eecdeaad99 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -582,6 +582,11 @@ static int dca_parse_frame_header(DCAContext *s)
s->lfe = get_bits(&s->gb, 2);
s->predictor_history = get_bits(&s->gb, 1);
+ if (s->lfe > 2) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid LFE value: %d\n", s->lfe);
+ return AVERROR_INVALIDDATA;
+ }
+
/* TODO: check CRC */
if (s->crc_present)
s->header_crc = get_bits(&s->gb, 16);