Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: "Martin Storsjö" <martin@martin.st>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] cherrypick ab7926341 into 4.2
Date: Fri, 17 Nov 2023 07:11:13 +0200 (EET)
Message-ID: <b1ac9b3d-cd7c-93d4-7ca5-77cf2c7b8a9e@martin.st> (raw)
In-Reply-To: <20231116225012.GP3543730@pb2>

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".

  reply	other threads:[~2023-11-17  5:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-16 22:35 Reed Weichler
2023-11-16 22:50 ` Michael Niedermayer
2023-11-17  5:11   ` Martin Storsjö [this message]
2023-11-17 17:18     ` Michael Niedermayer
  -- strict thread matches above, loose matches on Subject: below --
2023-11-16 22:28 Reed Weichler
2023-11-16 22:34 ` Reed Weichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b1ac9b3d-cd7c-93d4-7ca5-77cf2c7b8a9e@martin.st \
    --to=martin@martin.st \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git