From patchwork Sun Apr 9 14:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1598669pzb; Sun, 9 Apr 2023 07:27:05 -0700 (PDT) X-Google-Smtp-Source: AKy350bGdqp4MbDlKYfaca1ddGQWaimnBmfPxyQlUDauW4rGNCVg1FxEtzYzEKw5NwPfctA+cXgW X-Received: by 2002:a17:906:3a4c:b0:947:5acb:920c with SMTP id a12-20020a1709063a4c00b009475acb920cmr4966698ejf.34.1681050425197; Sun, 09 Apr 2023 07:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681050425; cv=none; d=google.com; s=arc-20160816; b=a9Vhj+Y0e2zWK2SQdHUzgW+2qFwfOY6GwdR+gjebn/kocuibPNatlU+mtPsTCwWDAu YAYPczFAK4+HJAjZE40tp3voVZlw2sr0Z35QAFTW9cf7conEI3Di/OAZaJz56RSz2tuJ KSfGkW+J29iyEsHhRSsZwyTJ0lAn/XRNhy6yRXxz6JJ4zaSC1yR42gZRfRAZpEZQKecP PsKHk8ZfdkBpZDt/TUVCE25QhWwPEEdocM7jpN7opDJXYw5RIKwFDn+gLFhZbd2hz8gt a71eML4jCn2Dy/yf2xcO2/IfaJGBP3e8kpEKABxBK+qmRFgt3SC+Mmqojvtaff2N/R5B uItg== 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=LrXx3exz4VlSoljEo7U89JgTLF5GwgvjRVttqSy+dUc=; b=k799y9PyiV7VoCI2g3KDGIah021SdnwzohpewpsSbdmcpqf+11MF1kKI8wRUE8ryEP 9NDbtAT+0P5Tp7uAR3r65RqCgcgpklfA0/K86F2jb1kUtAsKNw8Pd9ieLfzHgP2hjydO X/mYvf2hzVuK05vT0CErJ+xydzJ43zN1vdQoBs7EPwq/PB4b1t0rvjJ02tGhMyOt4mBI uLIY308Dimg26snxQFFolRXspCrmCWBpGFaa/FX4gMscnx0n2fCsny6v4X838A8NiVPj OTSu7+3/ePtQqb0Sj4Y3HN1Ezz5YI2pr8auSj2Q8LWcs6Jwy9rKT3KfGffaqNEZ8amcv 0iOg== 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 gt39-20020a1709072da700b00947ca9388eesi8345538ejc.540.2023.04.09.07.27.04; Sun, 09 Apr 2023 07:27:05 -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 725CF68BE23; Sun, 9 Apr 2023 17:26:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 924B668BCE7 for ; Sun, 9 Apr 2023 17:26:32 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id B21CD40002 for ; Sun, 9 Apr 2023 14:26:31 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Apr 2023 16:26:25 +0200 Message-Id: <20230409142627.19820-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230409142627.19820-1-michael@niedermayer.cc> References: <20230409142627.19820-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/escape124: Check that blocks are allocated before use 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: pt1lEYs0rOFL Fixes: NULL pointer dereference Fixes: 57819/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-5077280228769792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index e8a8395f4b1..592de09a9fd 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -155,7 +155,7 @@ static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb, // This condition can occur with invalid bitstreams and // *codebook_index == 2 - if (block_index >= s->codebooks[*codebook_index].size) + if (block_index >= s->codebooks[*codebook_index].size || !s->codebooks[*codebook_index].blocks) return (MacroBlock) { { 0 } }; return s->codebooks[*codebook_index].blocks[block_index];