From patchwork Fri Jan 6 19:47:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2078 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5976619vsb; Fri, 6 Jan 2017 11:47:49 -0800 (PST) X-Received: by 10.28.167.199 with SMTP id q190mr119969wme.15.1483732069595; Fri, 06 Jan 2017 11:47:49 -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 30si1493932wrs.104.2017.01.06.11.47.49; Fri, 06 Jan 2017 11:47:49 -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 49EB968A12C; Fri, 6 Jan 2017 21:47:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EB4A689E48 for ; Fri, 6 Jan 2017 21:47:34 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id c85so7309628wmi.1 for ; Fri, 06 Jan 2017 11:47:40 -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=5T/u9B5fR7RbT0aYw/Rs1Xbn6B8x5uLQBA7kkh9kM10=; b=UrehqyipWIa5zSmiXiLcH8QVzhwtG3XuvYBdoE/fwNnp8GN3/xvlmFn4dTIebMLkKM DW2SwZ4+JHadIm3mX6kKHD1604IZkGjrXN+XYL7AJFcGum3sxzS9wsjiSezrqXXO9pN8 iozZTqNPPf0M0xBOYxNG62/dneNrkc6xf+uMK3zqEwsjIj08DGMYQZwNUghIlWhy+BM0 JCK4Du09FpEBzGCv7LcJz7mGCZu0kYJe1YUg5NomttistpZ9R+x8ZpSASV3pZ3DgQ8tB +J36RAJYM+JvmX+0WdpLNlt8JFj4TQgVwGRPKnkcTHCvkG+M+/4RkkaAimd6X82/bOIu h0EA== 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=5T/u9B5fR7RbT0aYw/Rs1Xbn6B8x5uLQBA7kkh9kM10=; b=cP73Z/uU5vlZy7Mg+DFcUbk2vDh046+JSvhVkqMv9rhZv2touv6gwqHtwSdK/j4rnp OVXC0qgWruGeSuQRfevwsvUqiRc18aNkTE4rOWilHghlwSED42Xzs56d/YTg04geAqw2 KqEs1anJD+VeWZxvvqs8E0p2EB9Hs0kKK+BNNtV+oQi3oB0yCE0JRc7AZOC7UZRvzBIS c+Nc0+RfPebeecryQ0Nb35lW/tA9EeP+DU6cj7d+kk7ZZOPP0iCifSMIBRDPZ2e56j60 fk8J0oJHYhrbK6F2xkkLkoAWarOXAjxDXcO+1tlTEN7SYg4+JWsjjx8QBnsko/qB3+n5 1aQg== X-Gm-Message-State: AIkVDXIrjqQChDO6LCtRTQKHctQgbknjIU8zlWovBZgU49ralMmb7rQ3UMEEEoNTUTg82g== X-Received: by 10.223.131.99 with SMTP id 90mr2915850wrd.14.1483732060156; Fri, 06 Jan 2017 11:47:40 -0800 (PST) Received: from [192.168.2.21] (p5B072B3E.dip0.t-ipconnect.de. [91.7.43.62]) by smtp.googlemail.com with ESMTPSA id d85sm4907513wmd.17.2017.01.06.11.47.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 11:47:39 -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: <29837586-a59c-56e7-5b0b-61c1edadedb0@googlemail.com> Date: Fri, 6 Jan 2017 20:47:39 +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 3/9] 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 30eb723bd5..03422e5b2c 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_RETURN_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 *