From patchwork Fri Dec 16 02:33:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1824 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1093354vsa; Thu, 15 Dec 2016 18:33:37 -0800 (PST) X-Received: by 10.194.126.38 with SMTP id mv6mr454101wjb.142.1481855617365; Thu, 15 Dec 2016 18:33:37 -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 r129si1270520wmr.28.2016.12.15.18.33.36; Thu, 15 Dec 2016 18:33:37 -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 30A3C6898E8; Fri, 16 Dec 2016 04:33:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5DFC6898E8 for ; Fri, 16 Dec 2016 04:33:21 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id a20so2080758wme.2 for ; Thu, 15 Dec 2016 18:33:28 -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=1nIiRUhn1DKIKvfAvrI1FsOhFnrgbzSZE5/5TyeoJIc=; b=NGTpRqq2UXK06LgKIjIq4xDwa2SZXKCDSvuxuttcD2HW89MXNcIlF6DbtxHFslswH1 DOc/+QkpdBOif7kwu+fbTfaY6Kr1QTbEBBVl+cEtek51iFjts9VoSpXUYYC/DCZsEtlm lRWDVDjP0N4MX9QhRKZ1nl1RUdKyBb7kJYmp67HFkG90npaXOnjNZznoz7Yxr1psWcVe uyUpcBPjcvGAGpQDa8SmLghZDeNauRH/lrW1xlCBmnbEsjaXUXpXyb9GfWFj8vuZIDay 0T1QTO29lBgxbHP4Y3zrJwA5NooJOKy+5NLVW/nuseKen+q/MiaslJZ7l6aHATDGDAeU OPoQ== 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=1nIiRUhn1DKIKvfAvrI1FsOhFnrgbzSZE5/5TyeoJIc=; b=YQ87s7k0tscG9hjDFv5NPQW2BjAU+14G0TodbQ+Xw7kBQD6d3fN5WbpBtfdnDwEnrJ 49iL19jE40jzOlvRhmv4Y3c5STl3oEvrgUuHZjskwZb2Xzc8uIAWooVaQi+dWBmRDI8I rBX16qT58mCxEyK4dY1/Zsu0wvZUDf5mQXHyO7MAdLGbXpLUtu9LTD6bFRi6WJOj0tVT xtuCQf5hP/3QyY0IZGIi0a5WM+S/w1+/IPR80tOidVzYbaxK2kuCe6KHYX7rQvqHlh77 /vPf07dJSxhLa/ACgclrpCR71Io0b/Ox+yeNpYH9WoJqsyLM8MypbFRnN7pMkqNCNcJJ KUBg== X-Gm-Message-State: AIkVDXJJVxcvVom3tlQUPzQQpKBlZxKK6XnPhryx/uymfCup2oqwdj54Byf2ZWGhtBEvCw== X-Received: by 10.28.226.139 with SMTP id z133mr1063096wmg.139.1481855607678; Thu, 15 Dec 2016 18:33:27 -0800 (PST) Received: from [192.168.2.21] (pD9E8E08E.dip0.t-ipconnect.de. [217.232.224.142]) by smtp.googlemail.com with ESMTPSA id z6sm4630721wjt.24.2016.12.15.18.33.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2016 18:33:27 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <9663f686-48d6-0d43-ce9b-848b467366be@googlemail.com> Message-ID: <2072b18d-c176-8313-8ad8-a6bf077fde95@googlemail.com> Date: Fri, 16 Dec 2016 03:33:26 +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: <9663f686-48d6-0d43-ce9b-848b467366be@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/7] electronicarts: 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/electronicarts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 30eb723..9088fe1 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -556,6 +556,7 @@ static int ea_read_header(AVFormatContext *s) st->codecpar->codec_tag = 0; /* no tag */ st->codecpar->channels = ea->num_channels; st->codecpar->sample_rate = ea->sample_rate; + FF_BAIL_ON_OVERFLOW(s, ea->bytes > INT_MAX / 8 / 2) st->codecpar->bits_per_coded_sample = ea->bytes * 8; st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate *