From cbe84b4ffae4619417e119ed63d7c49826feac81 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 6 Nov 2013 13:12:59 +0100 Subject: [PATCH] avformat/astdec: sanity check channels & sample rate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes probetest failure Reviewed-by: Reimar Döffinger Signed-off-by: Michael Niedermayer --- libavformat/astdec.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/astdec.c b/libavformat/astdec.c index 886274410d..12252dcb67 100644 --- a/libavformat/astdec.c +++ b/libavformat/astdec.c @@ -27,12 +27,15 @@ static int ast_probe(AVProbeData *p) { - if (AV_RL32(p->buf) == MKTAG('S','T','R','M') && - AV_RB16(p->buf + 10) && - AV_RB16(p->buf + 12) && - AV_RB32(p->buf + 16)) - return AVPROBE_SCORE_MAX / 3 * 2; - return 0; + if (AV_RL32(p->buf) != MKTAG('S','T','R','M')) + return 0; + + if (!AV_RB16(p->buf + 10) || + !AV_RB16(p->buf + 12) || AV_RB16(p->buf + 12) > 256 || + !AV_RB32(p->buf + 16) || AV_RB32(p->buf + 16) > 8*48000) + return 1; + + return AVPROBE_SCORE_MAX / 3 * 2; } static int ast_read_header(AVFormatContext *s)