From patchwork Fri Dec 16 02:35:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1827 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1093828vsa; Thu, 15 Dec 2016 18:35:12 -0800 (PST) X-Received: by 10.28.211.72 with SMTP id k69mr487471wmg.137.1481855712421; Thu, 15 Dec 2016 18:35:12 -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 x20si4933128wju.188.2016.12.15.18.35.11; Thu, 15 Dec 2016 18:35:12 -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 6718E680ABB; Fri, 16 Dec 2016 04:35:03 +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 8B5406804BE for ; Fri, 16 Dec 2016 04:34:56 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id g23so2086956wme.1 for ; Thu, 15 Dec 2016 18:35:03 -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=QP8n1QT0zEpv1jqd6X+ooDqzRebx2QkHaXxKw2XZsJM=; b=lqDXevFXoqOA3w8KLf0z1oBJXfQDR6V+rW3yq2mTzPIbyv15k5MWVA0GeR6/UNQ7wc 2PkB+2IKuZrkPX9Ulj6G0P0W5freOkRCmseYDw00UIwtAgysKDHbz641/u+8VUiQqiEv BjSO/u4oOEX8EzwB5u5c8VCxHriVUYCpk9JsqsJkOQeJRE6KH++q8uPOBpgppZgo4Ms7 4CMDa6ixqF/sRxfM6fRhkacUVpXLjTlIK2mH1yAMlvv0RHwDHn4vpSKC0jRrjzX3FFSX Z/tS1hpCNi3dc/SNSNd/zmwQyCtswAUTwfeLXGTJ3NxjQibtomMsNhMTfF1D5kQ1nvwy oBQw== 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=QP8n1QT0zEpv1jqd6X+ooDqzRebx2QkHaXxKw2XZsJM=; b=maUMBwrhP2dXVeCpZk+VexD9I5wvHviP7vuVrEFi1MK0lPsuMsZHWkFEzL+kenncln U0HDjmzV6tgwbC+2G4dmvVF0bG5oN+59FvcMF4RRnEQcLuMvKR7IFNaQUn9dZh/JOFn0 JLOHFTWj9GtgjBvvNzaJc6OgblhQ7QCgtoPHDGPr12F1xOnU9bpqXbfcq/E+4aLzmp3v LGzr+sMf1FnqaB/rhhxlRqb8peG/1i9T8Foqyy29wNc4U+o/j//U4ayo2lICigpQV1/J auvgPjf6Zznr04uy6pxagoEqDHuoDO+eFDW4ilVJ96OKEZOJL0jmbsW8Dlor9buBbgHR 6zAA== X-Gm-Message-State: AIkVDXJ5wOYgfx2FrlO81rcCHpMslN/vwW5K8XL5osxU1Ky4ilAgSSqceL/ahHrYzJUOgA== X-Received: by 10.28.163.5 with SMTP id m5mr578980wme.98.1481855702410; Thu, 15 Dec 2016 18:35:02 -0800 (PST) Received: from [192.168.2.21] (pD9E8E08E.dip0.t-ipconnect.de. [217.232.224.142]) by smtp.googlemail.com with ESMTPSA id wg8sm4631900wjb.42.2016.12.15.18.35.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2016 18:35:01 -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:35:01 +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 7/7] pvfdec: 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/pvfdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/pvfdec.c b/libavformat/pvfdec.c index b9f6d4f..868ef0b 100644 --- a/libavformat/pvfdec.c +++ b/libavformat/pvfdec.c @@ -56,6 +56,7 @@ static int pvf_read_header(AVFormatContext *s) st->codecpar->sample_rate = sample_rate; st->codecpar->codec_id = ff_get_pcm_codec_id(bps, 0, 1, 0xFFFF); st->codecpar->bits_per_coded_sample = bps; + FF_BAIL_ON_OVERFLOW(s, bps > INT_MAX / st->codecpar->channels) st->codecpar->block_align = bps * st->codecpar->channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);