From patchwork Sun Oct 23 16:26:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1140 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1837012vsd; Sun, 23 Oct 2016 09:26:39 -0700 (PDT) X-Received: by 10.28.125.67 with SMTP id y64mr11977638wmc.65.1477239999150; Sun, 23 Oct 2016 09:26:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x7si8024221wmg.134.2016.10.23.09.26.38; Sun, 23 Oct 2016 09:26:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B688B689C65; Sun, 23 Oct 2016 19:26:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E35A689A7A for ; Sun, 23 Oct 2016 19:26:26 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id d128so6293774wmf.0 for ; Sun, 23 Oct 2016 09:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=s/l/i/U+16aiFAX2YwcDib4eNHKj/LM2cvcvaQ10zpk=; b=pFfoLbN8qWl8IbcpDpVCai6zAuPVn9vAX2A8T6Cra/mvj20p3xLTAiqmyhDZdo9PhB a7NFovhO2DScRFAB0I6sDhKwUsmuKmAoyQRzjuul4eZL9VI9mgeNbAB09ZR3BnfFMOsv oFVor8admMtFQgwqwfKhoG9IfYKkTMv2ecTtMnD066BiHYvpzOVr52r/zrUBqkveabn4 ZqPkgTjvV+hTYsDSo5YvKnbcqPCJcgsmc9p/pLIzaDyomfeMSdCBdzdtN9kuYXTFfl0x wJ1bKB6YYoUIityvo8g60p82V5qSmPHktBbD3IWw5Vy3uTZ42bTZkUp5Z+YPbtjtyuW+ Hceg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=s/l/i/U+16aiFAX2YwcDib4eNHKj/LM2cvcvaQ10zpk=; b=OFsVnPWZgaktVzsd03ySosPaEZEIEWsSm3HYAErGOzJXK5reJakTu3FuK5IOxjzOlp mTfTtTVffnK0COQ8abNLyFkdMYMhoDKdRMBwdOe+NtpWfSt8i8M4+vPG1ChiQPx3oN9C bcW9wmTKiQSh/F6sckIKPZ9gyQLXLsK204FJosIWwPAt8B/MnttofNxUcgBBL75jw0Lj Z+V8CH9OsJaitebkSM58reZfF8rObCWOk3zPNya15n1yziaSrHpUnMsjroBgEvfD/5hH D04PLwChAJmX9siiD/UaC9MYsioESoR/3dbNaL6783fJLg6SZToL2yZ22CYfcGRgTXMk F5iA== X-Gm-Message-State: AA6/9RnBRGEXk2scAonrItgl6OCif6Deh3OCjR8zpBn8+ci8ziKhexngN3PT5v1erEc6VQ== X-Received: by 10.28.5.207 with SMTP id 198mr19674379wmf.22.1477239988473; Sun, 23 Oct 2016 09:26:28 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id y2sm14526697wjx.20.2016.10.23.09.26.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:26:27 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Date: Sun, 23 Oct 2016 18:26:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/12] adxdec: validate sample_rate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A negative sample rate doesn't make sense and triggers assertions in av_rescale_rnd. Signed-off-by: Andreas Cadhalpun --- libavformat/adxdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c index cf44531..0315ecb 100644 --- a/libavformat/adxdec.c +++ b/libavformat/adxdec.c @@ -109,6 +109,11 @@ static int adx_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } + if (par->sample_rate <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", par->sample_rate); + return AVERROR_INVALIDDATA; + } + par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = s->iformat->raw_codec_id; par->bit_rate = par->sample_rate * par->channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;