From patchwork Thu Oct 5 19:44:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a24:b0:15d:8365:d4b8 with SMTP id t36csp257027pzh; Thu, 5 Oct 2023 12:45:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9yMHz/DsmaCiqq/PYM7jR+H8PGUBSrkcZ19U0sGYBm+cpu+Zc0el/2FB8fPmFifCYbEla X-Received: by 2002:a17:907:78c3:b0:9a2:232f:6f85 with SMTP id kv3-20020a17090778c300b009a2232f6f85mr6039816ejc.52.1696535111689; Thu, 05 Oct 2023 12:45:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696535111; cv=none; d=google.com; s=arc-20160816; b=SN4ASWaOS01KrzFZbXubiTGM0QCGNOXalXi0sHkJtFIFcwiZyym2+CkG9hGIplOAKq oRbyNX2QDPPvhlQqxkJ6LM+VvClmTvJlcgNLySck7bSeCJFt4yvwMDg2EMxSAgplfOV5 F2UvAuG1i7lNbkDe4DuveEp7R844j6kahEiG/PMw+TIyomfWUevDtMy7Z12oRj4YlrOT Qk2Pz/beNiSdHkN0OJdL9g3v/uBZ6gkomDvMX8CDdUIC3o8Wt7UI2rLrN0Tc5Wu8V4Y7 0BhCb1gSV2bOPEMEPjQhZWas61DNEYbz5B3t1RFrf5rx5XNRaU7BaHoqcoQcJFhIC5b7 Xu+w== 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=WDvXCX6bqzd+pgSYiEeaudtNjzfbJI78HWMxa6t2OJA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ej4nxk46u8fWsCR6tCwLukc1dZymVtSAu6gvpwb0CjQciu85DnWpxXQKG4F3n7RlX3 n7f4qVdNg3SlLghosyc3zjS39QoOyLc9dEPmGGyIOnaf0C9EHbXIcTPpLUHbvTu8Nj6T 5hePo0eniE5OuFZ2L2RwZXr87Jle71ieh26EdNSLgNvKld44Qu+9R71IMgmohePf4zhV INIxDMfrellzE+l3TOprPOAnBf2gi8YTqX3W2JqDqPtcvTAsDahhrskGgZgUN5RGof5X G0eSSk6ahs4l8nRC1gN+craD1dquuvvF9WzCYg28CDUYHjFrJ+8ExJPmIYOayAooI1YY hznw== 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 h6-20020a17090634c600b0099bd602097bsi918082ejb.544.2023.10.05.12.45.11; Thu, 05 Oct 2023 12:45:11 -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 A6B8268CC17; Thu, 5 Oct 2023 22:44:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B5AA68CA0E for ; Thu, 5 Oct 2023 22:44:43 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1EEE0FF803 for ; Thu, 5 Oct 2023 19:44:42 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 5 Oct 2023 21:44:38 +0200 Message-Id: <20231005194440.1678-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231005194440.1678-1-michael@niedermayer.cc> References: <20231005194440.1678-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/cbs_h2645: Fix showing bits at the end in cbs_read_ue_golomb() 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: MAUIPqypC3mK Fixes: Assertion n>0 && n<=25 failed at libavcodec/get_bits.h:375 Fixes: 62617/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5156555663998976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h2645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 0a1c8ea4266..fbfd671efea 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -43,7 +43,7 @@ static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc, max_length = FFMIN(get_bits_left(gbc), 32); - leading_bits = show_bits_long(gbc, max_length); + leading_bits = max_length ? show_bits_long(gbc, max_length) : 0; if (leading_bits == 0) { if (max_length >= 32) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid ue-golomb code at "