From patchwork Fri Jan 6 19:47:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2086 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5978842vsb; Fri, 6 Jan 2017 11:54:44 -0800 (PST) X-Received: by 10.223.170.214 with SMTP id i22mr2815050wrc.61.1483732484376; Fri, 06 Jan 2017 11:54:44 -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 n26si3468762wmi.56.2017.01.06.11.54.43; Fri, 06 Jan 2017 11:54:44 -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 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 E52B368A23A; Fri, 6 Jan 2017 21:54:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f195.google.com (mail-wj0-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F0B868A0F8 for ; Fri, 6 Jan 2017 21:54:30 +0200 (EET) Received: by mail-wj0-f195.google.com with SMTP id ey1so1484852wjd.2 for ; Fri, 06 Jan 2017 11:54:36 -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:content-transfer-encoding; bh=Vv6HY5+ye2bxX3aUX1+PUsanzkIhj74xWcK/W7O4/qQ=; b=YpWRLfebUd+ncMjkHPkRr/H+6gmLKh4DHh1egD9VJBZAOxAOYPmntcvFVS426I1tGZ Et4G2BCGuQaEP+V8ic0RqHeqU0GXMchnzQuT2SXcaNNNmvDis9nCXYsRSIqqFno5zdsL HC0vQf3Lsk/CnXHlAdaozVirA8PDiGm6eZ8NlHvD7kzK0+Ni1mudbqp+2J+TQYeedERX YE8pOgx4RZREWbzrrLbs3Ya1Dh+Xz82e+ne8ZtDZNSX2ghrw9+E/7nfQ214aueD1+dgL MCv4hYR7a9vvH8DtgjzBgaZmr1euQ5vyP3QQWbpY6gdKblJpKfKRZsC3J38qiNOSioYh A5eA== 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:content-transfer-encoding; bh=Vv6HY5+ye2bxX3aUX1+PUsanzkIhj74xWcK/W7O4/qQ=; b=QCPj3C7ctztgAYGuzntVsI5X6zHGAZlleM6obHC1XOHPFX/anjmSuN6e3RembKCEVz rHlcwEFW5m2qNExpRT7IZND6e/Id2IWQC9Oe7o+WTVlpPQ3QwACHR2+/qWm2Yjtlypmd /OOJId3SKRAMp5UxHK3H18q8nCLmJsex6tVEHVp0nkEDhEerI5g9wepa2EQ9oNzpFpLD aUHcYIUktfCWy1StjGRQyuq0gHQAiplUAtpkCA/fz64ggHg24x48YIaPYRzYDbf1lOrD vvE821F/lZFd05kKOtboF26zOcMOgwYHYjwn1acFddnrg2QiwoaA4+AelC8g3lc/K0Nc gtCw== X-Gm-Message-State: AIkVDXKF0B8s3zLtRnDiS4yDkjCAXTVtcKqlxvvw6uSULsrvhbNex6Q+b9S8Ddm4B/VdvQ== X-Received: by 10.194.30.193 with SMTP id u1mr42254wjh.103.1483732040608; Fri, 06 Jan 2017 11:47:20 -0800 (PST) Received: from [192.168.2.21] (p5B072B3E.dip0.t-ipconnect.de. [91.7.43.62]) by smtp.googlemail.com with ESMTPSA id ei2sm110173616wjd.47.2017.01.06.11.47.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 11:47:20 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <8f290505-70a1-d5b0-cbcf-96522ab12ce4@googlemail.com> Message-ID: Date: Fri, 6 Jan 2017 20:47:19 +0100 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: <8f290505-70a1-d5b0-cbcf-96522ab12ce4@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/9] 4xm: 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" Signed-off-by: Andreas Cadhalpun --- libavformat/4xm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 2758b69d29..45949c4e97 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -187,6 +187,7 @@ static int parse_strk(AVFormatContext *s, st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; + FF_RETURN_ON_OVERFLOW(s, st->codecpar->channels && st->codecpar->bits_per_coded_sample > INT_MAX / st->codecpar->channels) st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample;