From patchwork Thu Dec 15 01:19:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1798 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp482245vsa; Wed, 14 Dec 2016 17:19:25 -0800 (PST) X-Received: by 10.28.184.88 with SMTP id i85mr154944wmf.49.1481764765898; Wed, 14 Dec 2016 17:19:25 -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 lg5si57154104wjc.131.2016.12.14.17.19.25; Wed, 14 Dec 2016 17:19:25 -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 B6A12689A68; Thu, 15 Dec 2016 03:19:17 +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 10C9B689923 for ; Thu, 15 Dec 2016 03:19:11 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id g23so2951986wme.1 for ; Wed, 14 Dec 2016 17:19:17 -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=CP4uXYUeMYTMZBhZoDdTKFWHMcAQEXkV1F4YVBgnsy0=; b=UG7whXgCD7HaRACXv5EKOgXJzf3aE4so6MnokgjkXFXgu/APSy03+LZliyAqrMg+WC F4GJGidAyBFLAJY6s6YWBd2cJFfH7bF64+Sm9ToKe/fX2PBSH0pS1TpfbgyQcAK4TVs5 ASzpcWDBngCB6Ms7ngU+0TLs+6/7uziakApm4qD+XeFxgvF5T8ZceGyQHjtw4Y+DVwtD /ZUnY+dSh9Bv1HE1VQNWCu75Mjf3hLwnFLUZ2BlKl96TZcKXgJfDQE/QKy4YUYl0DgIP xyNCUE07og+gb+Vr+EqyPMraj30j8EvT6evHknH+qtoxRB3bGkrtyLqHG8Ck8URwJWdB 0apA== 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=CP4uXYUeMYTMZBhZoDdTKFWHMcAQEXkV1F4YVBgnsy0=; b=JNWXFyNICIrIdkaDzi+e4msWRyNGcq0HgyQj5yMxUjJ74DL0c7hf21cJD2QD4asEvd E+TlwvxLOrDBqQ244KzQ82Lsb+58pzUhD4iNNe0DWsDi4KMvFeluhN/B/OuJACYpNmkq sJ0KUTNBv8Ly4tUsbbjfie6oEHhhLGY00Ynjx5ybt3VcmI/bmL8wsCneShsyUPlv4kPQ HxRdQadHC9/PM1OBZbLIV7i3lo1ENx5JKl9LbawApxVD3QReTQhASjXZyAu3oHaCYBSC jbSPthOKZgu8Ib5v/4fAHUvZJgZkxl+twCShX6NQsVS7puivgnQCjIN3CVmjXC8mBc+1 bFDQ== X-Gm-Message-State: AKaTC01I5swd2cx6Q9PQyM9rSIC/xY4KX2zFIkmdK1/6EB0znk7PEAt/rSf5Y50kjJeQsA== X-Received: by 10.28.36.87 with SMTP id k84mr10179581wmk.64.1481764756433; Wed, 14 Dec 2016 17:19:16 -0800 (PST) Received: from [192.168.2.21] (p5B095A24.dip0.t-ipconnect.de. [91.9.90.36]) by smtp.googlemail.com with ESMTPSA id gk6sm69595991wjc.46.2016.12.14.17.19.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2016 17:19:15 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <609c350e-1785-22f4-afeb-169005483a85@googlemail.com> Message-ID: <13cf291c-d1e9-0071-0f31-710eff0d0c19@googlemail.com> Date: Thu, 15 Dec 2016 02:19:14 +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: <609c350e-1785-22f4-afeb-169005483a85@googlemail.com> Subject: [FFmpeg-devel] [PATCH 4/6] ircamdec: 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/ircamdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/ircamdec.c b/libavformat/ircamdec.c index 59f3a49..3efc2b4 100644 --- a/libavformat/ircamdec.c +++ b/libavformat/ircamdec.c @@ -96,6 +96,11 @@ static int ircam_read_header(AVFormatContext *s) } st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id); + if (st->codecpar->channels && st->codecpar->bits_per_coded_sample > INT_MAX / st->codecpar->channels) { + av_log(s, AV_LOG_ERROR, "Overflow during block alignment calculation %d * %d\n", + st->codecpar->bits_per_coded_sample, st->codecpar->channels); + return AVERROR_INVALIDDATA; + } st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(s->pb, 1008);