From patchwork Fri Dec 16 02:33:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1823 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1093463vsa; Thu, 15 Dec 2016 18:33:58 -0800 (PST) X-Received: by 10.28.58.14 with SMTP id h14mr1074233wma.7.1481855638120; Thu, 15 Dec 2016 18:33:58 -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 h84si1247426wmf.90.2016.12.15.18.33.57; Thu, 15 Dec 2016 18:33:58 -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 8D28B689B59; Fri, 16 Dec 2016 04:33:49 +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 D03F4689AEE for ; Fri, 16 Dec 2016 04:33:43 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id m203so2067110wma.3 for ; Thu, 15 Dec 2016 18:33:50 -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=9h7+RUQi3LJECnM2a1IZZoIKQ65TtHK5SDHgPxggrvE=; b=Q176SlwKUWZG+yuE6MUhTjViicZ1/xdyo1ka5/44G3kwrmWb+oz4dgjYfz3Xav/I54 HMQjpfY4SmzPS4oE4M7aREvvRCZWATKQBCjZsW0NChd+WMMyaVC3hsMn0lRtGJllyady kSne4OMnxKTQyi73lkQ9FwzAnTclgp1WpDsyMcmTp7rhIj6ks3w8NA27YMa/eWIalDxv DGXl9VdpX8SS3ds0C4IR7R5b3t6My2930H+cyGPZ6c1Phkc3qvmgPGGleT/X+a8tlj/p p+7XVELe+elT3mnOuJDV/Ki9CVlqJbjnm76mwnnExLc53MH2cVcDf/VPvFQxmB+HGFn8 7wwQ== 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=9h7+RUQi3LJECnM2a1IZZoIKQ65TtHK5SDHgPxggrvE=; b=WhJHQxBwh5fcqE+k5FhZYIWwAehPwOiUYdQhI8fVMoLaWv1RqqKNGAwIWGfc+NSOSC McAdkK4x5W1emXqxEbsmyKLotD85fl/sOWcxiIJzA7J/Xd+TctmvHZWJJNyU488Xs1xP 5wxR6FyjYY4ZCdZYuKgL5HbJgHFHrdsTkvzrs+wINp1ENYDgHVFocWznYr8RHHD4aSTe G8wl6oEk/FHU/po1ch1gZr6EHJj7p68eeTZ9D2DjYmWWLpnjrxiJT34iCUll0uFszxsm QnfOK+WAJh7FuC8LgR8cM9MmdCavtgmPiju43sNdzlN7StUYbXLJatnHr4fCnbL+cdK/ HuCA== X-Gm-Message-State: AIkVDXI+Dr2EIewd+1dHogujODZKttiH8Vl8nO8RI6XpNGvY2LpWPit2mlP74j8Unz247A== X-Received: by 10.28.198.67 with SMTP id w64mr1051862wmf.13.1481855629716; Thu, 15 Dec 2016 18:33:49 -0800 (PST) Received: from [192.168.2.21] (pD9E8E08E.dip0.t-ipconnect.de. [217.232.224.142]) by smtp.googlemail.com with ESMTPSA id v3sm4657502wjp.13.2016.12.15.18.33.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2016 18:33:49 -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: Date: Fri, 16 Dec 2016 03:33:48 +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 4/7] genh: 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/genh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/genh.c b/libavformat/genh.c index b683e02..e23c1b2 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -74,6 +74,7 @@ static int genh_read_header(AVFormatContext *s) case 0: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; break; case 1: case 11: st->codecpar->bits_per_coded_sample = 4; + FF_BAIL_ON_OVERFLOW(s, st->codecpar->channels > INT_MAX / 36) st->codecpar->block_align = 36 * st->codecpar->channels; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_WAV; break; case 2: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_DTK; break;