From patchwork Sun Oct 16 20:44:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1027 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp94378vsd; Sun, 16 Oct 2016 13:44:39 -0700 (PDT) X-Received: by 10.194.235.165 with SMTP id un5mr9326872wjc.200.1476650679127; Sun, 16 Oct 2016 13:44: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 w1si36461765wje.194.2016.10.16.13.44.38; Sun, 16 Oct 2016 13:44: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 F1E35689918; Sun, 16 Oct 2016 23:44:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12C74689752 for ; Sun, 16 Oct 2016 23:44:29 +0300 (EEST) Received: by mail-lf0-f66.google.com with SMTP id l131so20222438lfl.0 for ; Sun, 16 Oct 2016 13:44:31 -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=90yB1bF8EJGbfKD/VeEdpkyiYOHS6+JW6QP/c6Yrm5M=; b=inT3tcnaBZPJVtQ5px9Wc5EG7YXkxPR7rZFTPWjNwIck1Y9wRVgpZU3ozuopd5pRFS WXBFAnrtleohWudp849TkM6AiPnQSJMuT+7DDfQ2bNbHwsUASe69QZ5QyUanUQbJppPX WG/j4FNJMVmuXYSw1+5Av0Tcsgf6d7f1dtUOgW8NQAn3FtgaNVCc1oWYDZ7EDNuhGra/ WLGyCvTc2ITHuCS42QtY9EgUotvPo8oo7HlnUQI471H4FJzhS8+htWPr1t2qz2PuzcHk d44blfqZDxgdKdIByCzNMD0bfHPE1p3z+vBdJcEKe6S5fw4k9fL/RWcSjNJOA8jiDX2j zZaw== 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=90yB1bF8EJGbfKD/VeEdpkyiYOHS6+JW6QP/c6Yrm5M=; b=Xn0hDiNVw+egmrtf7WUrtW3qjA3zGGPSvixs+/VmRM8bBB160i+6zzNDMa6Q7aDsnv g1eRvUBiU5wz3JD6/8TzHpZftq+P4kPFgnxjE4EM5cls77j/a33K3KMWdvMDgZU/JmBT HQHx0sHO2Q9MhYsHw4xDhJf8mVorp+4zt7fvuIewwXWmzK009JaNDwUaUtBV8+IZh+sH xOpdq7AKco6t1Dxg5qjDEltKZMoOQn9JmDCAOFUKxGsMB+LK1+VamHTUjzuxEyZledjG CjqPX4qyTVS/Yw0dZp/xRbXlcj0oTmM56RbsWyYBw+YyaAb/uNuP6J9zJywROKg3cb30 4OnA== X-Gm-Message-State: AA6/9Rl3ejQnhucemqfOhGKPHfq6iuGQP5ojZFSJLHiPFHO+eD+YOs2nDcKePIkrQYxmeQ== X-Received: by 10.28.88.1 with SMTP id m1mr1292038wmb.0.1476650670600; Sun, 16 Oct 2016 13:44:30 -0700 (PDT) Received: from [192.168.2.21] (p5B0720DA.dip0.t-ipconnect.de. [91.7.32.218]) by smtp.googlemail.com with ESMTPSA id v3sm46056659wjm.4.2016.10.16.13.44.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 13:44:30 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <0efe39d2-4b45-e0b8-9b1d-9f4ccff9d235@googlemail.com> Date: Sun, 16 Oct 2016 22:44:29 +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] westwood_aud: prevent division by zero 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" Signed-off-by: Andreas Cadhalpun --- libavformat/westwood_aud.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index 4750167..9c2d35c 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -164,6 +164,12 @@ static int wsaud_read_packet(AVFormatContext *s, if (ret != chunk_size) return AVERROR(EIO); + if (st->codecpar->channels <= 0) { + av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n", + st->codecpar->channels); + return AVERROR_INVALIDDATA; + } + /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ pkt->duration = (chunk_size * 2) / st->codecpar->channels; }