From patchwork Thu Dec 15 01:18:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1797 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp482129vsa; Wed, 14 Dec 2016 17:19:06 -0800 (PST) X-Received: by 10.28.23.16 with SMTP id 16mr10281846wmx.134.1481764745959; Wed, 14 Dec 2016 17:19:05 -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 r129si41297wmr.28.2016.12.14.17.19.05; Wed, 14 Dec 2016 17:19:05 -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 6200F689A49; Thu, 15 Dec 2016 03:18:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18A4668991E for ; Thu, 15 Dec 2016 03:18:51 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id m203so2947142wma.3 for ; Wed, 14 Dec 2016 17:18:57 -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=OdnhuB1h4C5444edoJbMe/nUznJif/oQkw8caWJIx6Y=; b=TlTqVs/8HL0lRVraLluVajp3pGPstSc7swEGrx2RPbcIvZoZvw0ZYRJvsEVhc8wvzV volEOiKLxPXyRlAK2ojF0de1nEA+/yT1M4YG9XRTdX+xptBajTOj8HueRol7B8FriDYX 60Y8PN+8dC+HMCataAhQvZM+qpSgtckDU2elgzR3HIes5c2s7KffgDnDEFo8Lfphi8Xe eB4+J6tFo4riOm6kWtEOrV2Sg6CMHnQm3DnntnakKJFw2xZz+ygQ1S1Nvy8xax6DuBzr cLQCUxIPcsfxln605mkVeVv37rCPy8j2OLiBccnAs8HaU2D9Ti1hi0kWTbQ/8Y5KphoI CD6A== 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=OdnhuB1h4C5444edoJbMe/nUznJif/oQkw8caWJIx6Y=; b=RpMFPo7LIkX4F3gFTrout4fei78aXuhCeYx3LHTnIiIFZsALYla+ZXvuobvIYJijpY Or9B9HJ+FL0qddF8rmlmBHf++ft2ur8eEEvf5DBemLfFROBhEdoXohlTHOUvhUpxlgW7 itr1vFfxyHuuMvgmGllPECpi1422twHer0eQ5L3PQwypVe4mdTNnWR+QgYNIUUZeczje jAmq35Z9y3but3oQoG9nvAZbMbYAb515bqMUbfqXDJMY9+UM6Cxl+n+19CqIy+McIVd7 ZvJw3NNOMHafuBW+PN2r6o7dDTqpJSmt9zeBqj0GmXGSKPuDF20qBoAXZDFkhEcXLxY7 5aSA== X-Gm-Message-State: AIkVDXI306KF8AAOfwyL7MKXxwZiSIRGuOg0cGNgpANZNlEJInnrR75MuENBmTWL3ND0gg== X-Received: by 10.28.187.11 with SMTP id l11mr177716wmf.72.1481764736525; Wed, 14 Dec 2016 17:18:56 -0800 (PST) Received: from [192.168.2.21] (p5B095A24.dip0.t-ipconnect.de. [91.9.90.36]) by smtp.googlemail.com with ESMTPSA id wg8sm69671788wjb.42.2016.12.14.17.18.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2016 17:18:56 -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: <45182d81-6198-042d-ceba-9f3832ec3e06@googlemail.com> Date: Thu, 15 Dec 2016 02:18:55 +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 3/6] 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/genh.c b/libavformat/genh.c index b683e02..5684352 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -74,6 +74,11 @@ 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; + if (st->codecpar->channels > INT_MAX / 36) { + av_log(s, AV_LOG_ERROR, "Overflow during block alignment calculation 36 * %d\n", + st->codecpar->channels); + return AVERROR_INVALIDDATA; + } 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;