From patchwork Sun Oct 23 16:29:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1147 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1837976vsd; Sun, 23 Oct 2016 09:30:07 -0700 (PDT) X-Received: by 10.194.43.74 with SMTP id u10mr8431115wjl.12.1477240207299; Sun, 23 Oct 2016 09:30:07 -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 bp10si12098564wjc.237.2016.10.23.09.30.06; Sun, 23 Oct 2016 09:30:07 -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 F161F689CE2; Sun, 23 Oct 2016 19:30:01 +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 EC240689CC0 for ; Sun, 23 Oct 2016 19:29:55 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id f193so6287045wmg.3 for ; Sun, 23 Oct 2016 09:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=5To3tU6ZQGZ946JGbpXUx1tUEGbP6cYP0PH7qSH3i4E=; b=lX4UdV9P7FM2NLauCm+aVs198V/dfQ4n2WHc1aSvakYTHtlgavJVmQoRD0wjWeHhdc 9XNLQbE9sD6TMOnf0mLvIY4TCXJGBYHfeB2uNSJSag/+f/TLpLAuBjMmtUGknisMwuGu B9NLSzfSMxKys/hWKpVXZDXlsvR1wtrWSQsJki8l2Kj51Z8wQIc8xU6GJqjPN5MjPcnL 34mSOVXQb0iDhvu4NUbeGh48ol+LeSK9obZn4+qFuGK4NcJuwI6gZwJa4dmNAKDNf061 57bAreB4/iFqgmmROvHfhzOViYFaCMhrR0rgoM6tLCRf4BQCNvtaesilG4P7s/5KLDab dwcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=5To3tU6ZQGZ946JGbpXUx1tUEGbP6cYP0PH7qSH3i4E=; b=B/w9aH3nzBUhBhkvNN7jEH9Tzmqi5gbxd2ZXUnbOAkJJMUyznnhO16Xz1I80RJ1u6R 0QDmtITheH2e6K9hmNhmRCYKfbwf6zRQ3R6Q0AVhoj9I/J9GhJEjZfEW2hPR5r4owBRh mwTCpx9VWvloped68Pr5ALbdyfC3niBEfbJyqJrUHoITxwBJQWUC3WBa/l2b1W3UUHKx TIR74ibLOp2hhL/GpPsNvcmQUrWxOl3PyKN6t2rO0g0mbCZlb7L8VhSzweGw/uP+Y0wy GZWelUbjZPYOD4WyMe4TSVPB0sSCNz1uSmbcWrWOO2aNse83cZZk+vz3hMxXro0GKkjV NM6A== X-Gm-Message-State: AA6/9Rn4ci0rb2iv1odY2bLgS+hkCm92NqHciwxkdlqqrhrTwlsnRzYDJ0e94LMXRuokMQ== X-Received: by 10.28.67.6 with SMTP id q6mr17777304wma.43.1477240198687; Sun, 23 Oct 2016 09:29:58 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id c198sm955898wme.24.2016.10.23.09.29.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:29:58 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Message-ID: <7e02ec04-9d1f-7c51-094a-f0c1e7ba8a1f@googlemail.com> Date: Sun, 23 Oct 2016 18:29:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Subject: [FFmpeg-devel] [PATCH 08/12] mvdec: 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/mvdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 80ef4b1..f0a29eb 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -317,6 +317,10 @@ static int mv_read_header(AVFormatContext *avctx) ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->nb_frames = vst->nb_frames; ast->codecpar->sample_rate = avio_rb32(pb); + if (ast->codecpar->sample_rate <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate %d\n", ast->codecpar->sample_rate); + return AVERROR_INVALIDDATA; + } avpriv_set_pts_info(ast, 33, 1, ast->codecpar->sample_rate); if (set_channels(avctx, ast, avio_rb32(pb)) < 0) return AVERROR_INVALIDDATA;