From patchwork Thu Jan 26 01:11: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: 2314 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2470677vsb; Wed, 25 Jan 2017 17:11:13 -0800 (PST) X-Received: by 10.223.130.111 with SMTP id 102mr205836wrb.59.1485393073827; Wed, 25 Jan 2017 17:11: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 137si999239wma.32.2017.01.25.17.11.13; Wed, 25 Jan 2017 17:11: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 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 1344168A65F; Thu, 26 Jan 2017 03:11:11 +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 6E8CF68A628 for ; Thu, 26 Jan 2017 03:11:04 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id d140so46805091wmd.2 for ; Wed, 25 Jan 2017 17:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=caUl7j8OjQJyNtuyKMKaW504sbsfQ4/fMiTTt72fDYo=; b=J9IBdxNqiNbDnHuBZoGxUAHnP1hXGv5fXvP9e0h4O524j1hcV7VOESOtK6sX2ntf2q x9m5QQ2RKR3KHXKTZrf7q8juxxHm/EULHs7CH71U48v16sRDsuQgwUa7jlXty/2uImAH 3/vAxsZgyDkTBUwjHElFGQwq5YTRp4+2Lbm/nK+nEnweJqHyqewuheNptb4M9JuC/mgc ovwDdCZtGjowWc2ZUU/oIP+NMxOzap0pLjc1khoUq4UAKebeh34pso0HEelBWp/aWgK1 P+Imd6dNin8djlF4ZBEPeD75vckrs4pEfEeJRny4USqdqpVVHFQT/KbbiT8IWzriT5qM Ev+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=caUl7j8OjQJyNtuyKMKaW504sbsfQ4/fMiTTt72fDYo=; b=LkVUn6fCj2P2MgVE2MGw1y9FukpohHqRIF2DtWHr82GlG8/m1WAv9YyCGGywzNVyt1 QY9ABWFKHbKHMQbsyncO8mjFhPSEIOFerCn+p6wb6Pji6OWVXdgfatW5sRT/jBW3f4v5 snBR0tvei0CoRuoLZI5dUrOvwmYAJXCN70/fa9EQktipfffcdbsA8+WAzNjMV/mFUQkK IZvLXMHHYIswITV/CQ7+9hbtJBRyz/AVKFzNCmQihtUac1LwG697T3h5wTuHEqLCpZZI IZJpPdiRznhbQXbGLnaGBYd6RSnnCOdswhGIVIgRFFL5EJ1fN1l6+7tNKKWeV7dYmhBW PhEQ== X-Gm-Message-State: AIkVDXLeaqBME6fCx2IY+fcNTTDfK6zsHKvnVpmbm2Rv1b7MMxbn/EDN3QsTMVmhzfyvkQ== X-Received: by 10.223.145.227 with SMTP id 90mr179142wri.156.1485393064542; Wed, 25 Jan 2017 17:11:04 -0800 (PST) Received: from [192.168.2.21] (p5B0954C8.dip0.t-ipconnect.de. [91.9.84.200]) by smtp.googlemail.com with ESMTPSA id l37sm23146054wrc.41.2017.01.25.17.11.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 17:11:03 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Thu, 26 Jan 2017 02:11:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] 4xm: 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/4xm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 2758b69d29..ead6d2b424 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -29,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" @@ -153,8 +154,10 @@ static int parse_strk(AVFormatContext *s, fourxm->tracks[track].audio_pts = 0; if (fourxm->tracks[track].channels <= 0 || + fourxm->tracks[track].channels > FF_SANE_NB_CHANNELS || fourxm->tracks[track].sample_rate <= 0 || - fourxm->tracks[track].bits <= 0) { + fourxm->tracks[track].bits <= 0 || + fourxm->tracks[track].bits > INT_MAX / FF_SANE_NB_CHANNELS) { av_log(s, AV_LOG_ERROR, "audio header invalid\n"); return AVERROR_INVALIDDATA; }