From patchwork Sun Oct 16 20:38:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1025 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp93493vsd; Sun, 16 Oct 2016 13:38:53 -0700 (PDT) X-Received: by 10.28.199.75 with SMTP id x72mr5668043wmf.35.1476650333760; Sun, 16 Oct 2016 13:38:53 -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 w1si36431164wje.194.2016.10.16.13.38.53; Sun, 16 Oct 2016 13:38:53 -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 5F19868978C; Sun, 16 Oct 2016 23:38:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBDD16891DB for ; Sun, 16 Oct 2016 23:38:42 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id x23so17334722lfi.1 for ; Sun, 16 Oct 2016 13:38:44 -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=wUf+6/SGsHlCx/YaRhjDsNqpgHml2GeVFlDmz6jccck=; b=SP6WxKwgP1Y3tMWXYZZDNX7hZ31pQ+2ads/rrun620GbwYgON6BezwRqqaxUrMVxEO gFh5MVE3wAId8QZLzHaricSH5BrXvkZSeRRkcxtFkU67kmY07VyqRuiqjuXb9Lo1Noj1 HeF1KhFov/2olsNDnfvUjxw/D8x9nbFR2fdPeQiTyuiIkrim3OGbO0NiqLA66nfURCWY m102URDe0bGcnGhO7bhHxcZc5Glfs6Gx5y03AUQQQyOspACvSHI+YK4h5xK72q3wvXTG 27Km9f4lfsUJKzRyx1ApfauLMw0kMSSLY+973YsZny0eTkiY3Z4l/7p/iYspgYIZ5EZC LtMg== 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=wUf+6/SGsHlCx/YaRhjDsNqpgHml2GeVFlDmz6jccck=; b=jBmbqPzjNsyMfCcERdnC6iH29Eefw15LTqdz6g4NwstUjcqH1GtBMApdeOfp0wT1jL rCPB54A/oCu2TSR5eosxcLOO6/Ftpi4cosGRF9qydMplrHWsX/e+cnG5gfGUbj0c+Dsj dL6c6actgTJr1UYIK7Z6fmJe+76CV4vS/IMxxRXmNmUFn8of2BbO1u8NQbmbN5f9SraL hAbOpcJtuWYaIO2qf/Mzul/5utWC/SPq+vc5JEkjmouDsgUWVQlSPm2H/O24aocqExGm OJFjUpdm+By++OKHuEeNfBIElqoL6QZ2dHbO3928jwMp7u8E+IUnnDN5Cgcm8eFKGskz lgHQ== X-Gm-Message-State: AA6/9RlCr2ir9lGMRGW8dGaX2jrn7corJn8Vn5TgVuaPIf5dj7eUPRs3Oss9+oMd1El/3w== X-Received: by 10.28.230.66 with SMTP id d63mr5784244wmh.120.1476650324200; Sun, 16 Oct 2016 13:38:44 -0700 (PDT) Received: from [192.168.2.21] (p5B0720DA.dip0.t-ipconnect.de. [91.7.32.218]) by smtp.googlemail.com with ESMTPSA id p9sm46033463wjs.11.2016.10.16.13.38.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 13:38:43 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sun, 16 Oct 2016 22:38:42 +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] aiffdec: fix 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/aiffdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index cd916f9..de82787 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -380,7 +380,7 @@ static int aiff_read_packet(AVFormatContext *s, size = st->codecpar->block_align; break; default: - size = (MAX_SIZE / st->codecpar->block_align) * st->codecpar->block_align; + size = st->codecpar->block_align ? (MAX_SIZE / st->codecpar->block_align) * st->codecpar->block_align : MAX_SIZE; } size = FFMIN(max_size, size); res = av_get_packet(s->pb, pkt, size);