From patchwork Fri Jan 6 19:49:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2083 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5977099vsb; Fri, 6 Jan 2017 11:49:12 -0800 (PST) X-Received: by 10.28.52.76 with SMTP id b73mr142210wma.8.1483732152613; Fri, 06 Jan 2017 11:49: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 hc8si90073401wjc.214.2017.01.06.11.49.12; Fri, 06 Jan 2017 11:49: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 287F668A243; Fri, 6 Jan 2017 21:49:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38B1568A062 for ; Fri, 6 Jan 2017 21:48:58 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id ey1so1478179wjd.2 for ; Fri, 06 Jan 2017 11:49:04 -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=y+Y99/rMwhzQeWHPoz2Tma0Dc4Vdwf+UeklxPUYnmHA=; b=Yw3y3RIsmm0f61zLA34MQ5zxPlJrjx7jy51FC1iTUEaouatskgjHdzgqPY9akjGFhS gKDaAo9RUfQawdNiqn27gFKd0WAVJXaMPCBChzyaNtSjNGFlaZJspKrLHKHlLhT6Cz0E y6MNAcG+tsdoUl/NIZBFLioliHdC7zhrvo4tU5sgh0vEa1ECOVPHKo+lh5z2tkHNCSRl zCKOmPSiwopbyIoS5vf0rAkkcrEOrtB29aPPPsqRFfVFTp0SfDITX67bcZ7LTsr8uyCt tvDKDdyjnhhe1BjihOYEd+AofjELM+VZnOuyWJ1wl1nJhmn4hYxYzEplpOU5XnDJi4D5 fqjQ== 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=y+Y99/rMwhzQeWHPoz2Tma0Dc4Vdwf+UeklxPUYnmHA=; b=L08h921dM0Tx+6AKb8GjUtwq1NhvouF1J+GsQs+PT7CVOw9mFBl0Qv3mzvnpwFGek5 ItPJ4BOr+sot71mlLiP9CDS4FCQx1MKGCR0TZy4PvNxCzTFuwLsDLiDEjy3+6jIxU34G XxpY6RBhhh0aHWk9E9xwG16y8QM7cj5cCXIvRiaYEmwC119xhq+CXB7uKjI/lYMCOkhX TZgMIUhl1OCZve/MW3TceFAJhnttRjKH0zl1UDpX5iXjaG1MTGzRB3qLAkeB+k9tiU8y cpY/7nRCaPW1N8FROSCyrKCx8m2iNkFeXsgHYjgk+1FkOMVmoqJnsqOfn/nBWUQo0BIm 1vZw== X-Gm-Message-State: AIkVDXLc0s9q9FvK2Qppeuk1YSKico1Gh2tIlgVjjcsBy4bTwopa5GJ+Q5iHnNmdhX405w== X-Received: by 10.194.95.194 with SMTP id dm2mr59111064wjb.207.1483732143600; Fri, 06 Jan 2017 11:49:03 -0800 (PST) Received: from [192.168.2.21] (p5B072B3E.dip0.t-ipconnect.de. [91.7.43.62]) by smtp.googlemail.com with ESMTPSA id bf2sm109643089wjc.48.2017.01.06.11.49.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 11:49:03 -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: <34d563ef-f1b5-810a-6348-e99535a1a804@googlemail.com> Date: Fri, 6 Jan 2017 20:49:02 +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 7/9] 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 b9f6d4f2c2..94ef20c249 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_RETURN_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);