From patchwork Fri Jan 6 19:49:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2084 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5977366vsb; Fri, 6 Jan 2017 11:49:59 -0800 (PST) X-Received: by 10.28.69.91 with SMTP id s88mr127568wma.18.1483732199137; Fri, 06 Jan 2017 11:49:59 -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 e200si3471229wma.2.2017.01.06.11.49.58; Fri, 06 Jan 2017 11:49:59 -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 sp=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 1191368A25E; Fri, 6 Jan 2017 21:49:51 +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 486F568A114 for ; Fri, 6 Jan 2017 21:49:45 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id m203so7351256wma.3 for ; Fri, 06 Jan 2017 11:49:51 -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=+liItyg9s1Ifo6wQvVyGNbIsjlb4Dn3Y4G5Ce2d8Ouo=; b=VUET5Ix9872a2vCYVYMAiWipiQAQIr8qL3MgkvWhpf6ugKNitdMROho/106vErFvUk jpcRo8j+JQ6lwJnd1wQ46Lwc9BCzVk1IQWolI77cWVESkOufoDIa2oTnwDCPtIVh0nbF D35HtaEhBRNwlsS11BGllBxsoJur4JWRXs31RvdEXXnrnPXmxHOqMGjH+F6gd8b+Nfnl OaYmQ8RhQBpma3pZSQigaxNDLg//VrL+3n1styBcnAwTseaiH5YzpTxD4AG+GGpsn6LX zQP9y+PXLFDdF2iyenpzU/9E0naJz7xXm59O40zcEm9B5WoS40kuZYgOevJU+BEwNRN4 jcow== 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=+liItyg9s1Ifo6wQvVyGNbIsjlb4Dn3Y4G5Ce2d8Ouo=; b=mJJHJivFt5Dz8mSOgp8Px9PUBzRMeJ+W3lLzwgFlFOhDLcEHB3+akHSYJYoj0KSSGD 0KJbeskISpJ41THahLLlJ0gW/TB3PG4jdkem1SDLlAmhtEKK/7ehR+G8/Ev6u3GUKmpa mTBZCBNUXbwFHGMFbJy83kshtZG2JpTQriDzI+uQmLdpsIj0LLLwhDloknbRJFySrP2l OdPLGAyRkGIKI+38DJAe7LukCFTUYlqzqurj17nPLnL8z4D/1o3BwxsLwR/VlaMXpNK8 vaeL9gtQAHqxPpfRuquQOZrQz/af3IpUQ7fXBLH7xsj0BFGlHCoUd/zJOqh0cu2YOBES psVA== X-Gm-Message-State: AIkVDXIIB4erSFTlsOVDzEHEtVGOZ7g7S2FRJT99Lz/uTxdxKfMSVaw5ns3OodgKENfiHg== X-Received: by 10.28.22.200 with SMTP id 191mr112107wmw.132.1483732190731; Fri, 06 Jan 2017 11:49:50 -0800 (PST) Received: from [192.168.2.21] (p5B072B3E.dip0.t-ipconnect.de. [91.7.43.62]) by smtp.googlemail.com with ESMTPSA id w8sm4892893wmw.4.2017.01.06.11.49.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 11:49:50 -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: Date: Fri, 6 Jan 2017 20:49:49 +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 9/9] xvag: 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/xvag.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/xvag.c b/libavformat/xvag.c index 5ef4fb0900..1f28df7b89 100644 --- a/libavformat/xvag.c +++ b/libavformat/xvag.c @@ -74,6 +74,7 @@ static int xvag_read_header(AVFormatContext *s) switch (codec) { case 0x1c: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; + FF_RETURN_ON_OVERFLOW(s, st->codecpar->channels > INT_MAX / 16) st->codecpar->block_align = 16 * st->codecpar->channels; break; default: