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 8E4C947C9B for ; Fri, 17 Nov 2023 05:11:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C50E868CC5A; Fri, 17 Nov 2023 07:11:23 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37E4B68C972 for ; Fri, 17 Nov 2023 07:11:17 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 3AH5BF9M003725-3AH5BF9N003725 for ; Fri, 17 Nov 2023 07:11:15 +0200 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 596EEA1478 for ; Fri, 17 Nov 2023 07:11:14 +0200 (EET) Date: Fri, 17 Nov 2023 07:11:13 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20231116225012.GP3543730@pb2> Message-ID: References: <20231116225012.GP3543730@pb2> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH] cherrypick ab7926341 into 4.2 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 Thu, 16 Nov 2023, Michael Niedermayer wrote: > On Thu, Nov 16, 2023 at 02:35:58PM -0800, Reed Weichler wrote: >> pretty self-explanatory. >> i guess they forgot to cherrypick it when it was first committed. >> here is my code to repro: https://pastebin.com/raw/yQr3WWvX >> it needs a FLAC file as input. >> it hit an EXC_BAD_ACCESS here: >> https://github.com/FFmpeg/FFmpeg/blob/c6c36aa97a/libavformat/utils.c#L2227 >> index was equal to -1, so that code shouldnt even run, usually means UB. >> --- >> libavformat/utils.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/utils.c b/libavformat/utils.c >> index 4067d55fa1..2143d9fb59 100644 >> --- a/libavformat/utils.c >> +++ b/libavformat/utils.c >> @@ -2183,7 +2183,7 @@ int ff_seek_frame_binary(AVFormatContext *s, int >> stream_index, > > patch corrupted by newline > > patch locally backported to 4.2 - 4.4 Instead of applying this patch, I'd suggest just doing a regular cherrypick of the referenced commit - ab7926341 - which would preserve both authorship and the original commit message with the more accurate description of the issue. // Martin _______________________________________________ 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".