[FFmpeg-devel] [PATCH] cherrypick ab7926341 into 4.2

[Martin Storsjö]

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