From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 216B34B9F5 for ; Wed, 7 Aug 2024 23:53:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D39468DBAB; Thu, 8 Aug 2024 02:53:45 +0300 (EEST) 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 852B168DAAB for ; Thu, 8 Aug 2024 02:53:36 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B8E6640003 for ; Wed, 7 Aug 2024 23:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723074815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vizoyyXl5hfU+bU8h5sALASxWdfYEDOSkRmllEq/eZE=; b=UlKG9z8qMoVncT3UzPZ6/njqcFFoo9dM787Dnls+toPNhU0MmNXKBBBhvrnbJEPSymj9P+ j2OVX+dw/bF1y9owLlK5hAs6h4Z+TMSqV3fUSWUDljWgd87mWLsO3jzfdJKSEsHs6JXnKe o5Hlbh0z+FHjmt5h+vMXIVa30rH0+v8zL6kBMqFn3wW4Vq7/mxDpNeCyemWBqFDp4Q01QZ HB7fPAwaVaGIY7d/GNb/C1tuqsD5b6NVmb+wiVrlqUxc898TcS1lCH6wLvYthDak0CuQHz XuCjyG/6174nZg6CuK3+Zn/SPpF/egBEECojE8EtMKOnlR+kgM04sHQEtszidw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 8 Aug 2024 01:53:33 +0200 Message-ID: <20240807235333.2148870-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240807235333.2148870-1-michael@niedermayer.cc> References: <20240807235333.2148870-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_vp9: Try to store fewer than 2 things in the same bit 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: use of uninitialized value Fixes: 70907/clusterfuzz-testcase-minimized-ffmpeg_BSF_VP9_METADATA_fuzzer-6339363208757248 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_vp9.c | 9 ++++++--- libavcodec/cbs_vp9.h | 3 +++ libavcodec/cbs_vp9_syntax_template.c | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 816d06da04d..7b8bc9c7985 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -541,9 +541,12 @@ static int cbs_vp9_assemble_fragment(CodedBitstreamContext *ctx, size_len = av_log2(max) / 8 + 1; av_assert0(size_len <= 4); - sfi.superframe_marker = VP9_SUPERFRAME_MARKER; - sfi.bytes_per_framesize_minus_1 = size_len - 1; - sfi.frames_in_superframe_minus_1 = frag->nb_units - 1; + sfi.superframe_marker = + sfi.superframe_marker_2 = VP9_SUPERFRAME_MARKER; + sfi.bytes_per_framesize_minus_1 = + sfi.bytes_per_framesize_minus_1_2= size_len - 1; + sfi.frames_in_superframe_minus_1 = + sfi.frames_in_superframe_minus_1_2 = frag->nb_units - 1; size = 2; for (i = 0; i < frag->nb_units; i++) { diff --git a/libavcodec/cbs_vp9.h b/libavcodec/cbs_vp9.h index af15eb4bace..428662a8cdb 100644 --- a/libavcodec/cbs_vp9.h +++ b/libavcodec/cbs_vp9.h @@ -174,6 +174,9 @@ typedef struct VP9RawSuperframeIndex { uint8_t bytes_per_framesize_minus_1; uint8_t frames_in_superframe_minus_1; uint32_t frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME]; + uint8_t superframe_marker_2; + uint8_t bytes_per_framesize_minus_1_2; + uint8_t frames_in_superframe_minus_1_2; } VP9RawSuperframeIndex; typedef struct VP9RawSuperframe { diff --git a/libavcodec/cbs_vp9_syntax_template.c b/libavcodec/cbs_vp9_syntax_template.c index 2f08eccf180..3f542d0c5d5 100644 --- a/libavcodec/cbs_vp9_syntax_template.c +++ b/libavcodec/cbs_vp9_syntax_template.c @@ -421,9 +421,9 @@ static int FUNC(superframe_index)(CodedBitstreamContext *ctx, RWContext *rw, frame_sizes[i], 1, i); } - f(3, superframe_marker); - f(2, bytes_per_framesize_minus_1); - f(3, frames_in_superframe_minus_1); + f(3, superframe_marker_2); + f(2, bytes_per_framesize_minus_1_2); + f(3, frames_in_superframe_minus_1_2); return 0; } -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".