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 EC27C4A69A for ; Sat, 3 Aug 2024 15:00:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E83768D4F4; Sat, 3 Aug 2024 18:00:56 +0300 (EEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9652068D4F4 for ; Sat, 3 Aug 2024 18:00:49 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-7a1be7b7bb5so6796461a12.0 for ; Sat, 03 Aug 2024 08:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722697246; x=1723302046; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:content-language:references :to:from:subject:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=iXvgxip2RgJ7N3Y2hXsXzKhNyPWJq7u+43Z05sAOriI=; b=QGohuW8us1NdkBAPoY4bIDHA7oKu+aZqxQw61MvkgRQPTWG8sl+f1pw1JYosJ+rjAN aCoU0RhciSX5hqJ+Qay7ximalsRGYfE7NcbiHXxd80oYR3l+wa26sHRmzT7OrW1FiXa5 1HxKJghId0MVloP5HbaqPMWrjgxr//+OnKQE0a6d0q8VywFCYtzhL87qzbzuOQptqDxI 9+S9EUH2tOjbQkIm/bQwQo/reb12/2/rVqM/mm9u1be6igPWtwuzh8S3SskFIwlme0Lo AYO+C+FiguNMEmnnmqPsnDFyg5YsbHdlkMW6/Ho+ULO+7kfKpadGjFHlH8kZmbZZgzrI eUqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722697246; x=1723302046; h=content-transfer-encoding:in-reply-to:content-language:references :to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iXvgxip2RgJ7N3Y2hXsXzKhNyPWJq7u+43Z05sAOriI=; b=e+4gO3UZVy9BZI7Uelf6wB1T6EnaqtCepnaYDRmANIgB4SttkjRilsa+1Oh5ODcM5D WUuDbK7Qy/QZMA1evbdwspdgS2PMTzU/FkHfUC3M/RyRN5vM/U8QfRnkjPdpVTw2l0Fk jdOalteXZL9u9OAzZhes9NuOICQqPjLH687xYqEq59R28hTpEeftXxGpywDVdcnfRXJ3 HCUqnDi4n6H7uXNvACDs9daioPXJgWqO3ZiJtEVPYDbVT5gGVF+uay1rmiiZzJ84Q1uX 7/+ZdBbST0IWhnuIuINul8/rOTWMno/XP5YACrROKIuqzzjkA8MP2PPOUV90FgOA5ghZ rp/w== X-Gm-Message-State: AOJu0Yz+o26/x2+cfuh5+CGBDRCLmjMBEsChKSNA9IRKXsW8kxgq3jZJ m8Kbg5gtIOlk/MTpL12WkI+qLofdgwH2CI2kYOjSwhOobvIsM2eJr4zYfw== X-Google-Smtp-Source: AGHT+IHojU4iX6OD8ViYuMq9mZeO1daU7dYG6fJBboeQgCVGEov4MC035n1mcE94zoMqB6MhxvfZNg== X-Received: by 2002:a17:902:f213:b0:1fa:ff88:891a with SMTP id d9443c01a7336-1ff5744b232mr64254725ad.48.1722697245948; Sat, 03 Aug 2024 08:00:45 -0700 (PDT) Received: from [192.168.0.14] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ff592acd2fsm35538945ad.286.2024.08.03.08.00.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Aug 2024 08:00:45 -0700 (PDT) Message-ID: Date: Sat, 3 Aug 2024 12:01:37 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: James Almer To: ffmpeg-devel@ffmpeg.org References: <20240801161814.7386-1-jamrial@gmail.com> Content-Language: en-US In-Reply-To: <20240801161814.7386-1-jamrial@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avcodec/cbs_h265: don't attempt to read 0 length elements in sei_3d_reference_displays_info 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 8/1/2024 1:18 PM, James Almer wrote: > Fixes: 70458/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5259339779080192 > Fixes: Assertion width > 0 && width <= 32 failed at libavcodec/cbs.c:608 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: James Almer > --- > libavcodec/cbs_h265_syntax_template.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c > index f1be30a6c9..12fa185c77 100644 > --- a/libavcodec/cbs_h265_syntax_template.c > +++ b/libavcodec/cbs_h265_syntax_template.c > @@ -2307,7 +2307,10 @@ SEI_FUNC(sei_3d_reference_displays_info, (CodedBitstreamContext *ctx, RWContext > else > length = FFMAX(0, (int)current->exponent_ref_display_width[i] + > (int)current->prec_ref_display_width - 31); > - ubs(length, mantissa_ref_display_width[i], 1, i); > + if (length) > + ubs(length, mantissa_ref_display_width[i], 1, i); > + else > + infer(mantissa_ref_display_width[i], 0); > if (current->ref_viewing_distance_flag) { > us(6, exponent_ref_viewing_distance[i], 0, 62, 1, i); > if (!current->exponent_ref_viewing_distance[i]) > @@ -2315,7 +2318,10 @@ SEI_FUNC(sei_3d_reference_displays_info, (CodedBitstreamContext *ctx, RWContext > else > length = FFMAX(0, (int)current->exponent_ref_viewing_distance[i] + > (int)current->prec_ref_viewing_dist - 31); > - ubs(length, mantissa_ref_viewing_distance[i], 1, i); > + if (length) > + ubs(length, mantissa_ref_viewing_distance[i], 1, i); > + else > + infer(mantissa_ref_viewing_distance[i], 0); > } > flags(additional_shift_present_flag[i], 1, i); > if (current->additional_shift_present_flag[i]) Applied. _______________________________________________ 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".