From patchwork Mon Jan 30 00:42:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2363 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1235808vsb; Sun, 29 Jan 2017 16:42:29 -0800 (PST) X-Received: by 10.223.153.135 with SMTP id y7mr16313053wrb.55.1485736949162; Sun, 29 Jan 2017 16:42:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c205si1927669wme.152.2017.01.29.16.42.28; Sun, 29 Jan 2017 16:42:29 -0800 (PST) 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 sp=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 8158568A4A4; Mon, 30 Jan 2017 02:42:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EC8668A476 for ; Mon, 30 Jan 2017 02:42:18 +0200 (EET) Received: by mail-wm0-f50.google.com with SMTP id 196so2525638wmm.1 for ; Sun, 29 Jan 2017 16:42:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to; bh=tMiWAqY5KlLEsTuR9aRb2/LyhGD8cvJeTSpSuSnoHic=; b=C7MT2/ZU+PDx5GabmRAW07DysNbH6wET7f97K+Ns0b44N5026wYI1pbLWjJ1+nixGD ocDJQBV8Vzh7O8vNLM5Qh8FwuByH6rt+UyKnpJcpn7IOzlh1e/Cxfv7+8UwQG/xqen8/ Hpnxn/9RJq+jgHQdX8Lxm0/bCnMobMPdX8fYTDxRwMaayCWHVNvxoQ9RvH3PWMuleA0Y dKmlyj4siEXGwM4fkOXLPspTstY/sS6uSOv3ukInRQMFw+J8phu71FSoePt6QM/El6RQ 4koghmt5pV6RLoiV5L/iHlNOBAiEPwYQPxtM9OKQL6e1OpcDs97hc5XfPfCBeN4dVweV 5RLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to; bh=tMiWAqY5KlLEsTuR9aRb2/LyhGD8cvJeTSpSuSnoHic=; b=trZcJmuxGcYGZcr9r2yr6hj32bDErm4AqhlycksjEAnp3f4+G2jL+3lUA02lubSytc JT0YDihc0elMDmzJ8VuFDn61h9rbfsBFG1b/FTGzHwrQUQioqMC6YJAKog0avOqJi/+2 EzceFvlhEJg01/heSLd6ghcAa28FQbeWkXBwi5EEmz+iPPcT5H1PzL/p7xHD3udVW99K bY+8SVDcRvCPsKMDdL0NvrwJ5G5wzwq2DU+nT5+h2zw4QSThvJRzZ9pMQQQKZtf1d7Wj 3uJuYtp9pJMjMgHe/ZCAYEScbjkDxAssJf8eVckU0RqAWrcgmc4g2F065WokdW1tWL9B 6cTA== X-Gm-Message-State: AIkVDXJY2joXizrgq2zfTPNUSLwRlndwwiKwknc2YRE+LsZP5WsOl4vnIq0Cy+uf2F68iA== X-Received: by 10.28.127.13 with SMTP id a13mr11085060wmd.96.1485736939535; Sun, 29 Jan 2017 16:42:19 -0800 (PST) Received: from [192.168.2.21] (p5B07262A.dip0.t-ipconnect.de. [91.7.38.42]) by smtp.googlemail.com with ESMTPSA id v102sm20130725wrb.11.2017.01.29.16.42.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Jan 2017 16:42:18 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: ffmpeg-devel@ffmpeg.org References: <20170129013434.GN4698@nb4> Message-ID: <88207ab8-0e14-823a-46d9-f7cf899f7d89@googlemail.com> Date: Mon, 30 Jan 2017 01:42:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170129013434.GN4698@nb4> Subject: Re: [FFmpeg-devel] [PATCH 4/9] ircamdec: prevent overflow during block alignment calculation 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" On 29.01.2017 02:34, Michael Niedermayer wrote: > On Thu, Jan 26, 2017 at 02:12:19AM +0100, Andreas Cadhalpun wrote: >> Signed-off-by: Andreas Cadhalpun >> --- >> libavformat/ircamdec.c | 6 ++++++ >> 1 file changed, 6 insertions(+) > > LGTM assuming the author/maintainer does not object, maybe he > prefers this without the log message Attached is a variant without the log message. Best regards, Andreas From bf03bedf16ee4659defdca1b82eb213448d00f59 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Thu, 15 Dec 2016 02:14:45 +0100 Subject: [PATCH] ircamdec: prevent overflow during block alignment calculation Signed-off-by: Andreas Cadhalpun --- libavformat/ircamdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/ircamdec.c b/libavformat/ircamdec.c index 59f3a49411..a6b7a280f3 100644 --- a/libavformat/ircamdec.c +++ b/libavformat/ircamdec.c @@ -20,6 +20,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" #include "pcm.h" @@ -87,6 +88,8 @@ static int ircam_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->channels = channels; + if (st->codecpar->channels > FF_SANE_NB_CHANNELS) + return AVERROR(ENOSYS); st->codecpar->sample_rate = sample_rate; st->codecpar->codec_id = ff_codec_get_id(tags, tag); -- 2.11.0