* [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash
@ 2024-03-27 18:19 Andreas Rheinhardt
2024-03-30 4:21 ` Andreas Rheinhardt
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-27 18:19 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Armin Hasitzka, Andreas Rheinhardt
Besides being redundant, freeing manually is actually harmful here,
as rtmp_close() may call gen_fcunpublish_stream() which dereferences
rt->playpath.
Reported-by: Armin Hasitzka <armin@grabyo.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/rtmpproto.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 4b01b67d28..b1d73b3d75 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2917,9 +2917,6 @@ reconnect:
return 0;
fail:
- av_freep(&rt->playpath);
- av_freep(&rt->tcurl);
- av_freep(&rt->flashver);
av_dict_free(opts);
rtmp_close(s);
return ret;
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash
2024-03-27 18:19 [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash Andreas Rheinhardt
@ 2024-03-30 4:21 ` Andreas Rheinhardt
2024-03-31 1:36 ` Andreas Rheinhardt
2024-03-31 2:16 ` Liu Steven
0 siblings, 2 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-30 4:21 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Steven Liu
Andreas Rheinhardt:
> Besides being redundant, freeing manually is actually harmful here,
> as rtmp_close() may call gen_fcunpublish_stream() which dereferences
> rt->playpath.
>
> Reported-by: Armin Hasitzka <armin@grabyo.com>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/rtmpproto.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> index 4b01b67d28..b1d73b3d75 100644
> --- a/libavformat/rtmpproto.c
> +++ b/libavformat/rtmpproto.c
> @@ -2917,9 +2917,6 @@ reconnect:
> return 0;
>
> fail:
> - av_freep(&rt->playpath);
> - av_freep(&rt->tcurl);
> - av_freep(&rt->flashver);
> av_dict_free(opts);
> rtmp_close(s);
> return ret;
I am pinging this and explicitly cc'ing Steven Liu, whose commit
991cf95fdeebc3af added the av_freeps to be removed above. Steven, did
you just feel that there was missing freeing code for the buffers above
or was there an actually confirmed memleak (there shouldn't be)?
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash
2024-03-30 4:21 ` Andreas Rheinhardt
@ 2024-03-31 1:36 ` Andreas Rheinhardt
2024-03-31 2:16 ` Liu Steven
1 sibling, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-31 1:36 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Steven Liu
Andreas Rheinhardt:
> Andreas Rheinhardt:
>> Besides being redundant, freeing manually is actually harmful here,
>> as rtmp_close() may call gen_fcunpublish_stream() which dereferences
>> rt->playpath.
>>
>> Reported-by: Armin Hasitzka <armin@grabyo.com>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavformat/rtmpproto.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
>> index 4b01b67d28..b1d73b3d75 100644
>> --- a/libavformat/rtmpproto.c
>> +++ b/libavformat/rtmpproto.c
>> @@ -2917,9 +2917,6 @@ reconnect:
>> return 0;
>>
>> fail:
>> - av_freep(&rt->playpath);
>> - av_freep(&rt->tcurl);
>> - av_freep(&rt->flashver);
>> av_dict_free(opts);
>> rtmp_close(s);
>> return ret;
>
> I am pinging this and explicitly cc'ing Steven Liu, whose commit
> 991cf95fdeebc3af added the av_freeps to be removed above. Steven, did
> you just feel that there was missing freeing code for the buffers above
> or was there an actually confirmed memleak (there shouldn't be)?
>
> - Andreas
>
Another ping explicitly cc'ing Steven Liu, this time with a more recent
email.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash
2024-03-30 4:21 ` Andreas Rheinhardt
2024-03-31 1:36 ` Andreas Rheinhardt
@ 2024-03-31 2:16 ` Liu Steven
2024-03-31 10:12 ` Steven Liu
1 sibling, 1 reply; 5+ messages in thread
From: Liu Steven @ 2024-03-31 2:16 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Liu Steven
> On Mar 30, 2024, at 12:21, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote:
>
> Andreas Rheinhardt:
Hi Andreas,
>> Besides being redundant, freeing manually is actually harmful here,
>> as rtmp_close() may call gen_fcunpublish_stream() which dereferences
>> rt->playpath.
>>
>> Reported-by: Armin Hasitzka <armin@grabyo.com>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavformat/rtmpproto.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
>> index 4b01b67d28..b1d73b3d75 100644
>> --- a/libavformat/rtmpproto.c
>> +++ b/libavformat/rtmpproto.c
>> @@ -2917,9 +2917,6 @@ reconnect:
>> return 0;
>>
>> fail:
>> - av_freep(&rt->playpath);
>> - av_freep(&rt->tcurl);
>> - av_freep(&rt->flashver);
>> av_dict_free(opts);
>> rtmp_close(s);
>> return ret;
>
> I am pinging this and explicitly cc'ing Steven Liu, whose commit
> 991cf95fdeebc3af added the av_freeps to be removed above. Steven, did
> you just feel that there was missing freeing code for the buffers above
> or was there an actually confirmed memleak (there shouldn't be)?
Confirmed memleak, but it’s long time i cannot sure how to reproduce that, I test rtmp those years use SRS.
Thanks
Steven
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash
2024-03-31 2:16 ` Liu Steven
@ 2024-03-31 10:12 ` Steven Liu
0 siblings, 0 replies; 5+ messages in thread
From: Steven Liu @ 2024-03-31 10:12 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Liu Steven
Liu Steven <lq@chinaffmpeg.org> 于2024年3月31日周日 10:16写道:
>
>
>
> > On Mar 30, 2024, at 12:21, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote:
> >
> > Andreas Rheinhardt:
> Hi Andreas,
>
> >> Besides being redundant, freeing manually is actually harmful here,
> >> as rtmp_close() may call gen_fcunpublish_stream() which dereferences
> >> rt->playpath.
> >>
> >> Reported-by: Armin Hasitzka <armin@grabyo.com>
> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> >> ---
> >> libavformat/rtmpproto.c | 3 ---
> >> 1 file changed, 3 deletions(-)
> >>
> >> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> >> index 4b01b67d28..b1d73b3d75 100644
> >> --- a/libavformat/rtmpproto.c
> >> +++ b/libavformat/rtmpproto.c
> >> @@ -2917,9 +2917,6 @@ reconnect:
> >> return 0;
> >>
> >> fail:
> >> - av_freep(&rt->playpath);
> >> - av_freep(&rt->tcurl);
> >> - av_freep(&rt->flashver);
> >> av_dict_free(opts);
> >> rtmp_close(s);
> >> return ret;
> >
> > I am pinging this and explicitly cc'ing Steven Liu, whose commit
> > 991cf95fdeebc3af added the av_freeps to be removed above. Steven, did
> > you just feel that there was missing freeing code for the buffers above
> > or was there an actually confirmed memleak (there shouldn't be)?
>
> Confirmed memleak, but it’s long time i cannot sure how to reproduce that, I test rtmp those years use SRS.
May be the memleak was reported by fuzz program, the test case can
injection failed result make the workflow into the failed,
The gen_fcunpublish_stream should after av_malloc rt->playpath,
rt->tcurl, rt->flashver av_malloc, and there cloud get failed in the
gen_connect.
Steven
Thanks
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-31 10:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-27 18:19 [FFmpeg-devel] [PATCH] avformat/rtmpproto: Don't free AVOpt-strings manually, fix crash Andreas Rheinhardt
2024-03-30 4:21 ` Andreas Rheinhardt
2024-03-31 1:36 ` Andreas Rheinhardt
2024-03-31 2:16 ` Liu Steven
2024-03-31 10:12 ` Steven Liu
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