From patchwork Thu Dec 15 01:18:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1794 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp482036vsa; Wed, 14 Dec 2016 17:18:49 -0800 (PST) X-Received: by 10.194.172.100 with SMTP id bb4mr88412120wjc.53.1481764729158; Wed, 14 Dec 2016 17:18: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 gr7si57087633wjb.113.2016.12.14.17.18.47; Wed, 14 Dec 2016 17:18: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 0E8EE68999A; Thu, 15 Dec 2016 03:18:40 +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 9E8D26891D0 for ; Thu, 15 Dec 2016 03:18:33 +0200 (EET) Received: by mail-wj0-f195.google.com with SMTP id he10so7452324wjc.2 for ; Wed, 14 Dec 2016 17:18:39 -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=DD0XR5xbS5ZI8wIoXcOvivwnCKU7j7T3SIcTmuEqrjo=; b=cjlBMXasdg56EW7igU484+m9gsgDQVLMpTg+DKa5/hDyG5lpabYeheKRFFq3jgDpoE 8ZCfKCqiigMlOZnqfGFDqqFfBcTaRrC5wlOsK1ZwLTBO6o9MvSfYeEIpEkzRDB1rSBwr BW9yGdLgfXmZQBQIqtvS+bI1Xo3g29pYPVenwPBI+nS2WYGtL2A76aPEY/ndZZ2qAwRl A3RCVmtWK7Qv3gPztn7mVR1JWOChglgQzpdzimK4/nCHR3UaDezXixEtu6Zr0rpkeg4q x/YBcHWJ16nTeCNBuuqSUCOgKZVacx1ecrZrQLB8m7yy9i8zOl91oPkQlbGflcox2Mzf EjNA== 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=DD0XR5xbS5ZI8wIoXcOvivwnCKU7j7T3SIcTmuEqrjo=; b=rmn0vWLygx0BPjD0ZzixPo+vgb/SocQKYQMrPxGMHLM2gF1yadq2PooBs4DJQipNkM 0yXuwUapIxoWY7J+jZyCeoKv9uhpjULBNMcB7R4l6+cImQ6iAf9W5qWiqUkIvuyzVSP6 OebpI0mAI1B7bWfZlh0f3GwSWNcmPi4ZZFwdALNRWKRCTsG+JdhhgHFgM1bNjEdltbcc O83cM3PQpJ78DU9yS2iDk804FRQzBJTmoeUDwGwZIpZDp5dnHg4IZAnCrUXdABOS14Xn UMSRfLHIjNuoYMic+RelLevBYXzj2aQuaQdZj8eOL3N/vAUv39hvRka9f8QWEuegK3Iq tj7A== X-Gm-Message-State: AKaTC00FHBzuCOvuUyr8D3wn7lopJXLpw77umhAwjfUCQQaB79g0jugNCPuM/9ODNQmGlA== X-Received: by 10.194.249.72 with SMTP id ys8mr16674147wjc.92.1481764719038; Wed, 14 Dec 2016 17:18:39 -0800 (PST) Received: from [192.168.2.21] (p5B095A24.dip0.t-ipconnect.de. [91.9.90.36]) by smtp.googlemail.com with ESMTPSA id di9sm69643187wjc.37.2016.12.14.17.18.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2016 17:18:38 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <609c350e-1785-22f4-afeb-169005483a85@googlemail.com> Message-ID: <18dc26b9-4a7b-8d4f-556f-abad75f6fd5f@googlemail.com> Date: Thu, 15 Dec 2016 02:18:37 +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: <609c350e-1785-22f4-afeb-169005483a85@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/6] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 30eb723..35a7363 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -539,7 +539,7 @@ static int ea_read_header(AVFormatContext *s) ea->audio_codec = 0; return 1; } - if (ea->bytes <= 0) { + if (ea->bytes <= 0 || ea->bytes > INT_MAX / 8 / 2) { av_log(s, AV_LOG_ERROR, "Invalid number of bytes per sample: %d\n", ea->bytes); ea->audio_codec = AV_CODEC_ID_NONE;