From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 3/3] avutil/opt: Preserve nb_channels in opt_free
Date: Tue, 30 Apr 2024 21:41:43 -0300
Message-ID: <78dc5659-da2b-4483-a304-f29baaea1ba5@gmail.com> (raw)
In-Reply-To: <20240501003825.GA6420@pb2>
On 4/30/2024 9:38 PM, Michael Niedermayer wrote:
> On Tue, Apr 30, 2024 at 06:27:23PM -0300, James Almer wrote:
>> On 4/29/2024 9:48 PM, Michael Niedermayer wrote:
>>> Fixes: division by 0
>>> Fixes: decoder modifying demuxer channels on failure
>>> Fixes: -sseof -5 -i zgclab/ffmpeg_crash/poc3
>>>
>>> Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>> ---
>>> libavutil/opt.c | 6 ++++--
>>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/libavutil/opt.c b/libavutil/opt.c
>>> index ecbf7efe5fb..24c08e4bc06 100644
>>> --- a/libavutil/opt.c
>>> +++ b/libavutil/opt.c
>>> @@ -132,9 +132,11 @@ static void opt_free_elem(const AVOption *o, void *ptr)
>>> av_dict_free((AVDictionary **)ptr);
>>> break;
>>> - case AV_OPT_TYPE_CHLAYOUT:
>>> + case AV_OPT_TYPE_CHLAYOUT: {
>>> + int nb_channels = ((AVChannelLayout *)ptr)->nb_channels;
>>> av_channel_layout_uninit((AVChannelLayout *)ptr);
>>> - break;
>>> + ((AVChannelLayout *)ptr)->nb_channels = nb_channels;
>>> + break;}
>>> default:
>>> break;
>>
>> A little bit of context would be helpful here. What's using nb_channels
>> after av_opt_free was called and where?
>
> demuxer sets nb_channels
> find stream info copies codec params to context
> find stream info tries opening decoder
> decoder, refuses, and opt_free_elem() is called on cleanup
> context now has 0 channels
> context gets copied into params of demuxer
Should this happen if the internal decoder failed to generate a frame?
Can it be avoided?
> demuxer goes like i have set the channels to a non zero value let me devide by them
> and oops
>
> there is more than one position in this chain of events this can be fixed
>
> thx
>
> [...]
>
>
> _______________________________________________
> 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".
_______________________________________________
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".
next prev parent reply other threads:[~2024-05-01 0:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 0:48 [FFmpeg-devel] [PATCH 1/3] avformat/kvag: Check sample_rate Michael Niedermayer
2024-04-30 0:48 ` [FFmpeg-devel] [PATCH 2/3] avformat/concatdec: Check file Michael Niedermayer
2024-05-09 1:03 ` Michael Niedermayer
2024-04-30 0:48 ` [FFmpeg-devel] [PATCH 3/3] avutil/opt: Preserve nb_channels in opt_free Michael Niedermayer
2024-04-30 21:27 ` James Almer
2024-05-01 0:38 ` Michael Niedermayer
2024-05-01 0:41 ` James Almer [this message]
2024-05-01 14:54 ` James Almer
2024-04-30 21:12 ` [FFmpeg-devel] [PATCH 1/3] avformat/kvag: Check sample_rate Michael Niedermayer
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=78dc5659-da2b-4483-a304-f29baaea1ba5@gmail.com \
--to=jamrial@gmail.com \
--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