From patchwork Thu Jan 26 01:13:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2320 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2471589vsb; Wed, 25 Jan 2017 17:14:00 -0800 (PST) X-Received: by 10.28.156.151 with SMTP id f145mr496551wme.8.1485393240077; Wed, 25 Jan 2017 17:14:00 -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 o81si972016wmb.108.2017.01.25.17.13.59; Wed, 25 Jan 2017 17:14:00 -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 EC59868A6ED; Thu, 26 Jan 2017 03:13:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06ADF689E04 for ; Thu, 26 Jan 2017 03:13:50 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id c85so46516621wmi.1 for ; Wed, 25 Jan 2017 17:13:50 -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=sRsozLi1KBzYe3JAO5wqByfu5p4EM7foFCCxM45TTTk=; b=fu9KiVn5lACznrL76rQXAuGzXWsVCvszNGjaolgMdk2zY3zJFV8HhTI3RBXfmNd6V6 WG3B/78Af0wr6drHDB+wMEOI/J03YM7/RokOShg4yIpCp4TYLmlATznWgjayN07vdVEk 9paTai+izX5hfqhJq6dubGYR2Q1VnQDzeqX1FS5U0xbBchJVewIja4ozNPNWcVZ9QIz4 xGa0tuZt21EpusvmTSWTTGeV4ZAO+J/Y4bCGrtjAS6F6vzJgofD96RoE+JmYgWXdL4XL X2IhKFgiKqjKyKXX83NYF2ccgIuhjqG6M4BKRBfa1HUh/6gNBKueKHKOzGpMIagkQnCF 3Q2w== 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=sRsozLi1KBzYe3JAO5wqByfu5p4EM7foFCCxM45TTTk=; b=k9ckLjiFG8SRQK4Cyl+Uz3NpMwtmxB027p2XuBsuMsl5rrigu4kQayMX5K/4vvRbc6 02wt9/gnvOeJoQH7g6DNDa3FcHhph5Jz5TaRgJgZU+QNbDUBJQ2r9ykJDw31eK0dmO/i GD5e+MylYYTkSUyit/lxwOH+qcyTtdMQgMEvOHem6sX9z3AJ4fSK2s/KUT0kW+vyiNiF I+E7ExHNSCKmVAuhnC5BxSLFyBJR++IsP13nLrSQmGDGpmVyfOw+3t4/wR36q0/kkvjq q6UqTSQxJio4v6JH5HwB5I/hw13LW5QxZyrNbshCeTmoOv733x9ODYURzm8jEJWLKuCy Xh2A== X-Gm-Message-State: AIkVDXKqdA2zMNYuIrZw2TBtvduLgghxN0/uwsOjVnSa7RYjvzW0ySIYPtVx9DnjpCc2AQ== X-Received: by 10.28.69.28 with SMTP id s28mr21323725wma.40.1485393230075; Wed, 25 Jan 2017 17:13:50 -0800 (PST) Received: from [192.168.2.21] (p5B0954C8.dip0.t-ipconnect.de. [91.9.84.200]) by smtp.googlemail.com with ESMTPSA id q1sm1089931wmd.6.2017.01.25.17.13.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 17:13:49 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: Message-ID: <49b95490-7e34-0ec2-509b-8fdd1453b6f4@googlemail.com> Date: Thu, 26 Jan 2017 02:13:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH 8/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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/xvag.c b/libavformat/xvag.c index 5ef4fb0900..22e4f1e3c8 100644 --- a/libavformat/xvag.c +++ b/libavformat/xvag.c @@ -20,6 +20,7 @@ */ #include "libavutil/bswap.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" @@ -68,7 +69,7 @@ static int xvag_read_header(AVFormatContext *s) if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - if (st->codecpar->channels <= 0) + if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS) return AVERROR_INVALIDDATA; switch (codec) {