From patchwork Sun Jul 25 14:01:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3002616ios; Sun, 25 Jul 2021 07:03:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg/IpXhXvhvIY0hz0c4frE/kqbIrEq0Tt4izqBuhcPF4f75BqfeJKh+LwJ5ggoHro0JZa9 X-Received: by 2002:a05:6402:7cc:: with SMTP id u12mr16319464edy.156.1627221786735; Sun, 25 Jul 2021 07:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627221786; cv=none; d=google.com; s=arc-20160816; b=XI2h05QSj6Uxx1qtMPadf4uoEIBXOx15j2n8X74Woip8fSXNwUJrusJVxmB73NpFZE 3TCrtcnxAcQuPbWVFFupUyV8jqwn3lFS2c22FMC0Zd0LEt5nacRtuCPXpm/5E7+YIR5I vVWwrOLG8AVBSKv0NwMhuEERs0N93XnBAxgmqlk2ad5LTFx22WTSCGCeOtatBi3ZwA+H VUlOQXTJvnBEhBXgleCjHMB7iYn8/wppQnTJWnyAsoFJ3YZG35l6fRLh62GJKZWr6fbm Tx16s+Povmh3dvcicLmTjtglmKaiPUrNDEOR+Af69B9+7dPt4K4fzW6PFnE5AD1uKIqr LkYA== 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=AuzmL0xYfnJh38X1TyYUU7E8o5vSvbrzZmcdFf89Qm4=; b=BO6hmla95cKXtd4jofxc+U+cfKf/QMj+glvvygWNANCleTjmsPWLXS5oZA9eFE0+xC 5Hhs5qn7o9B4DIWiOuYi+NHOu48PG+L2SP4TjHth+muBsJLhT/d9rjj/wGruBvgj25aa jl5+elkBxrjWu/XepHcXWuMFbVa/AKt3NW9gV4xtDiAilg4OiK8s1K8CkgJhLr+z8D0P k5rh/BswN4yzsvbO3mmMAexpHzse6e6aXah9VIUKGNM21sUmi0qlOB/XKazfn8XRQt7J Mw+knKW8kwZk9Z/xFslybCd0Xi5Osk3sAJu5C5ubhYzO+4LNqs/syB+9Wz7lMoXovJEG j5xA== 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 gv15si13230969ejc.383.2021.07.25.07.03.06; Sun, 25 Jul 2021 07:03:06 -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 0E52868A50C; Sun, 25 Jul 2021 17:03:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEC3D6880BA for ; Sun, 25 Jul 2021 17:02:56 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m7eiW-00DqaS-0A for ffmpeg-devel@ffmpeg.org; Sun, 25 Jul 2021 16:02:56 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7ehYmkIwYljeH7ehYmQbwJ; Sun, 25 Jul 2021 16:01:56 +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=ZTVOYYrZB3ywv88QJiUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Jul 2021 16:01:55 +0200 Message-Id: <20210725140155.9115-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210725140155.9115-1-michael@niedermayer.cc> References: <20210725140155.9115-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDQ8c3yr3fKRS+GT5AGJzt3mhEZgoGau4COS0rg61qAfLCBrrc2oJYC3Ti9zkDj+dmdYIvfCH8WBU8B3xKHPqBWawJR8kP+epzPoarSPYmTS7rjF0x8I APjoKLbTsUlbh6tFziwl4qLahnX19NoL8ggKIx7NOu5x+2TDt7WSDpFv Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/webp: Check available space in loop in decode_entropy_coded_image() 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: cpAI7uxT1myu Fixes: Timeout Fixes: 35401/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WEBP_fuzzer-5714401821851648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/webp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 83371ef6fd..3efd4438d9 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -627,6 +627,9 @@ static int decode_entropy_coded_image(WebPContext *s, enum ImageRole role, while (y < img->frame->height) { int v; + if (get_bits_left(&s->gb) < 0) + return AVERROR_INVALIDDATA; + hg = get_huffman_group(s, img, x, y); v = huff_reader_get_symbol(&hg[HUFF_IDX_GREEN], &s->gb); if (v < NUM_LITERAL_CODES) {