From patchwork Wed Apr 28 15:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp508813pxb; Wed, 28 Apr 2021 08:07:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf7kOkprvG58w941ZHHxZO8q6y7zjcmw8qIFbisC4IXgW0BtrcqRVVzNURGmA/p+cDAbQW X-Received: by 2002:a17:907:16a9:: with SMTP id hc41mr30210953ejc.84.1619622479594; Wed, 28 Apr 2021 08:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622479; cv=none; d=google.com; s=arc-20160816; b=skenNbRbZXPXwlR/gUID7UcrjEsd7HJAmMxe1qjmlipIB3Zu8KYUt5h9gDWo3q8V7j vRlaN3z0L4CakKZqpeuzQbPYrgiOi2Gz01Q3OKoq+YAYqL3tc2gTAseb/VmkL2qGBur7 PHkbHxlCzDpUWfqlUq/6Vgy9QwNxMQyiwwkEGGI0m219HyniIwhTeGZMWk2BBjzxkFJS shfn9Wthlz4dFKlT4oP8NFbf6YE5Z4QHrnynEIRpPX8ttrvDDxaMZg3yI1vqmxSax9xY 5KugQsTyc5rkxwNJ0bd7EIXXbFYXpbfq+8Z9mYsR6OsYmkFXETrLnKZBMZzdLC3oedx5 +FUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=FNNv1oHVFa55P+qZKzYQm89s60LmZOrTEmjikoBVk48=; b=j49u2XoAurV+xQI6LkAieGmIhDATbqbq5vSs9cJqHlIMD+Bc4tTk4BeQHYB0X7x6el cv7qjb7pVMamDoFXAsGOKmt12+pd1Lt34fX3V5WbSFwegxuGbDg3Zk9Rm+iKYeuNPUJ5 V1BfqeafrapISzMiCqEtToo3Z+O6X8gEKEPvHz1hR9jbsyOX5s7+puwUrize0t1pSkNj qSLhheFt7y5xCAG0dMJEkqT7EJdWiD/onurVlktGW6yWvIeeLPQD5poMwb7YGkdrHo56 ak2/1Q4UcdYTTTIGyIVxNSzMCdzWKKfx9WywdB8d6B5DcXKvnHsYMZiLKO8KXIntq3Sa grRQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bo9si276408ejb.184.2021.04.28.08.07.58; Wed, 28 Apr 2021 08:07: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29F19689815; Wed, 28 Apr 2021 18:07:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 728596891E7 for ; Wed, 28 Apr 2021 18:07:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lblmr-000bzJ-0H for ffmpeg-devel@ffmpeg.org; Wed, 28 Apr 2021 17:07:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id blltlck7iljeHblltlNuiD; Wed, 28 Apr 2021 17:06:37 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=EMIBWudf3AdPlb-ZhkAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:36 +0200 Message-Id: <20210428150636.28396-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/faxcompr: Check for invalid VLC in decode_group3_1d_line() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jpc9X+d0+QnF Fixes: infinite loop Fixes: 33674/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4816457818046464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/faxcompr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 7bf11d80ca..f1f7e67762 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -213,7 +213,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, run += t; if (t < 64) { *runs++ = run; - if (runs >= runend) { + if (runs >= runend || t < 0) { av_log(avctx, AV_LOG_ERROR, "Run overrun\n"); return AVERROR_INVALIDDATA; }