From patchwork Fri Jan 6 19:48: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: 2082 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5976744vsb; Fri, 6 Jan 2017 11:48:13 -0800 (PST) X-Received: by 10.223.160.23 with SMTP id k23mr2474961wrk.24.1483732093139; Fri, 06 Jan 2017 11:48:13 -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 j10si1485262wrb.75.2017.01.06.11.48.12; Fri, 06 Jan 2017 11:48:13 -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 CA6E868A12C; Fri, 6 Jan 2017 21:48:04 +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 58E0368A108 for ; Fri, 6 Jan 2017 21:47:58 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id u144so7376200wmu.0 for ; Fri, 06 Jan 2017 11:48: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=zBQH5alPb+WhdrCdQJ0u71m9AVclV8Fn3ctGotsV8cI=; b=Yt8ne9vIeIxMgnn3ioQopjQ9LurZVV796vtHBHgWRtbGWTOk9DIrfaaVkfLR5g13VW DKKRsrZpdS5kcnM9EyQoZwfXbnXzYDjQgOLyc1sz+wqlZSYfUGdmQiQsiIUiw7iHvYzH TzSWJKFHQgqYve384pV+nsih/9mRNOmrqRmqYN2Gb/dsoYatJ22V96oOBJ0vpyDFRh3f 8o0bAFiTTbGonbQQ6kBs76bSV03AKO44mLtOIX6qfCPfu6Bb3WkK0rSjf4fwdQscX8ZY TC2yXr0+P/HiMFuVWxghXnF/DSPOfFc6l0SJHWFznH5PW30U/wRoyYhVxS9p1P6dzz+4 pCFQ== 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=zBQH5alPb+WhdrCdQJ0u71m9AVclV8Fn3ctGotsV8cI=; b=A3rz2eNUYeENBoPCowS42Xf2CcDUrHzTl7Y6vqSY6nyIwcqnapr+YI1qJUKXk31O35 bthQxmVbK6RtVt3da45mqlji0KghBmjCgfykD+/OhlqzLLtoHiU4kHKJq+fLIZeZ5GMr fnPB7ogubGq8GdAR225XWdc1toxU0ERKsqJQ3B16PmbX2WBlYLmCvTc0u8UkfxKLODsp GJ/lwPrTJWpDNJhXqYyV0O3Jr91lDqtmFrfJcYx1lgeo3PssqtwufxTy3P007/FfQzbe Ts8TD0K9d/qCNXwsTnJWEbNTKkapm7lcQHul6gpY8YjzHKk7e0cJcuZrieukZUlF4oSI pyMA== X-Gm-Message-State: AIkVDXJ6Ms4ijJLX6JFq4Uk8NKCKjppjM2YtedtG+mfUYIrsXj+dS64D9e5CVC07dUQj+w== X-Received: by 10.223.139.220 with SMTP id w28mr2478269wra.172.1483732083791; Fri, 06 Jan 2017 11:48: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 kp5sm110235875wjb.8.2017.01.06.11.48.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 11:48: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: Date: Fri, 6 Jan 2017 20:48: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 4/9] 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 b683e026d1..6ce2588ed3 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_RETURN_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;