From patchwork Sun Oct 30 20:43:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1237 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp73950vsb; Sun, 30 Oct 2016 13:43:59 -0700 (PDT) X-Received: by 10.28.63.199 with SMTP id m190mr7262142wma.96.1477860239834; Sun, 30 Oct 2016 13:43:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hm2si26133073wjb.83.2016.10.30.13.43.59; Sun, 30 Oct 2016 13:43:59 -0700 (PDT) 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 C88796898A8; Sun, 30 Oct 2016 22:43:53 +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 BF8AE680D2F for ; Sun, 30 Oct 2016 22:43:47 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id 68so8995902wmz.2 for ; Sun, 30 Oct 2016 13:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=S2j4dJlkqkz6cwhnhyWeBN98bco4MR4ABmWLs7RL9SQ=; b=ABzLk/gJ5bkOu9PoMz6tzQOED/ruGqfvXAQTv/2UtfZEtyk81tCcqTksVXVPEl5MBG AZWnnCskmeNDvISBcGb5PF1zuhnOn5oTRZow3exgCKaVmBDontgnrK5pWAT/5RKsGCV2 Mu+15/gWAzfVEwYHC7hezpqApx2gXFv4+umyUc72oTdd1Pvr62Sc+ukjqj7w0haOTrDg G705cWjVcvCQEt86dXDZarpwR+JlF4y+Zfs1UzDR6cV+QNPf5f+lWrDsCtmHBL8y17+z C5YLBF8kHy9nFSRqDyg8pSGcngAmXIWjwPzvi2IW9MSAkdUnOAR8yXU7mdOEBTlkBRNz nf+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=S2j4dJlkqkz6cwhnhyWeBN98bco4MR4ABmWLs7RL9SQ=; b=cUCOlhEdbtr4VdEtbSWZfTuzk2R9qU63EWNdB4PmSs/UvGDK6iGDcH7S5aQ7jJokTI 0qDgFBsXLXzMFIgrh8T/MlfqgjmNgNp5jzH/PJl3np8LDGTknLhFq2Y/FayaYbqO91Jr 9yCpi1nf3UC/hkMll2btu81H5Hr87tAHsbsR2dsP1YaHpYMb3pFsEHq1wce3rspZnWe+ YJrWv5aYinHtvXOIHixIc9YdTez3eEG6DhMVN1czmgwWQNuJFrCy3ZUDVWjBZUWwnXQU hBoOTvCz8GgkuluISQgnqzIyEn9myQ4zTl+qs48K6Ie7wZlk53CgFokHVHOVckea5+HM 3elw== X-Gm-Message-State: ABUngvdumNb1RkWrYYezt8iZ5OzYQp1GU8JC1jqXloltrjijUPtRoP7zE36GSoUe+X4IhQ== X-Received: by 10.194.103.165 with SMTP id fx5mr19151379wjb.188.1477860230349; Sun, 30 Oct 2016 13:43:50 -0700 (PDT) Received: from [192.168.2.21] (pD9E8F048.dip0.t-ipconnect.de. [217.232.240.72]) by smtp.googlemail.com with ESMTPSA id y3sm26233640wjg.3.2016.10.30.13.43.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Oct 2016 13:43:49 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <95ea89f0-c5d6-266c-4945-21a7416a4352@googlemail.com> Date: Sun, 30 Oct 2016 21:43:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] interplayacm: validate number of channels 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" The number of channels is used as divisor in decode_frame, so it must not be zero to avoid SIGFPE crashes. Signed-off-by: Andreas Cadhalpun --- libavcodec/interplayacm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index f4a3446..c897e72 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -62,6 +62,11 @@ static av_cold int decode_init(AVCodecContext *avctx) if (avctx->extradata_size < 14) return AVERROR_INVALIDDATA; + if (avctx->channels <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of channels: %d\n", avctx->channels); + return AVERROR_INVALIDDATA; + } + s->level = AV_RL16(avctx->extradata + 12) & 0xf; s->rows = AV_RL16(avctx->extradata + 12) >> 4; s->cols = 1 << s->level;