* [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect()
@ 2025-06-14 8:33 Lidong Yan
2025-06-14 9:08 ` Zhao Zhili
0 siblings, 1 reply; 4+ messages in thread
From: Lidong Yan @ 2025-06-14 8:33 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Lidong Yan
In libavformat/rtmpproto.c:gen_connect(), if check on string length
or check on codec fourcc failed, ff_rtmp_packet_create() allocated
data in pkt would leak. Add ff_rtmp_packet_destory before return error
code.
Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEaEpkmRYJKwYBBAHaRw8BAQdAGwGqH/Dwod+i6kR0/Rhn5GanJ7wK8mM9tWP/
W2qu8Ti0HTUwMjAyNDMzMDA1NkBzbWFpbC5uanUuZWR1LmNuiJkEExYKAEEWIQQC
zskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIbAwUJBaOagAULCQgHAgIiAgYVCgkI
CwIEFgIDAQIeBwIXgAAKCRCZR31bPD+6o8wHAQCLomsA4XfTd8IdG983gGULUJe/
0432buy4nX7AsAc87QEA+/QIsWTR6XLJaLa1sLSQCsZkb86U3c17JzG9oivL8gW4
OARoSmSZEgorBgEEAZdVAQUBAQdAfYrEAWd+6bOXkKvHpFmMvKzxAtlhm6ZQKdAq
+MlJ7wQDAQgHiHgEGBYKACAWIQQCzskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIb
DAAKCRCZR31bPD+6ozWxAQC9OFisWrP/hHXUfj8AnC39r5pf5fEBz7lHvFgWNk2b
XwD7Bl6kvIIW7ReqtgXvcl7u78vEo+e9YeTGTlmAogjpeQk=
=rP+W
-----END PGP PUBLIC KEY BLOCK-----
---
libavformat/rtmpproto.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 846376e668..dd850f72ed 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -347,6 +347,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
if ((fourcc_str_len + 1) % 5 != 0) {
av_log(s, AV_LOG_ERROR, "Malformed rtmp_enhanched_codecs, "
"should be of the form hvc1[,av01][,vp09][,...]\n");
+ ff_rtmp_packet_destroy(&pkt);
return AVERROR(EINVAL);
}
@@ -370,6 +371,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
ff_amf_write_string(&p, fourcc);
} else {
av_log(s, AV_LOG_ERROR, "Unsupported codec fourcc, %.*s\n", 4, fourcc_data);
+ ff_rtmp_packet_destroy(&pkt);
return AVERROR_PATCHWELCOME;
}
--
2.50.0.rc0.47.g9cc88feafa.dirty
_______________________________________________
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] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect()
2025-06-14 8:33 [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect() Lidong Yan
@ 2025-06-14 9:08 ` Zhao Zhili
2025-06-15 23:37 ` Michael Niedermayer
0 siblings, 1 reply; 4+ messages in thread
From: Zhao Zhili @ 2025-06-14 9:08 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Lidong Yan
> On Jun 14, 2025, at 16:33, Lidong Yan <yldhome2d2-at-gmail.com@ffmpeg.org> wrote:
>
> In libavformat/rtmpproto.c:gen_connect(), if check on string length
> or check on codec fourcc failed, ff_rtmp_packet_create() allocated
> data in pkt would leak. Add ff_rtmp_packet_destory before return error
> code.
>
> Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
>
> -----BEGIN PGP PUBLIC KEY BLOCK-----
>
> mDMEaEpkmRYJKwYBBAHaRw8BAQdAGwGqH/Dwod+i6kR0/Rhn5GanJ7wK8mM9tWP/
> W2qu8Ti0HTUwMjAyNDMzMDA1NkBzbWFpbC5uanUuZWR1LmNuiJkEExYKAEEWIQQC
> zskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIbAwUJBaOagAULCQgHAgIiAgYVCgkI
> CwIEFgIDAQIeBwIXgAAKCRCZR31bPD+6o8wHAQCLomsA4XfTd8IdG983gGULUJe/
> 0432buy4nX7AsAc87QEA+/QIsWTR6XLJaLa1sLSQCsZkb86U3c17JzG9oivL8gW4
> OARoSmSZEgorBgEEAZdVAQUBAQdAfYrEAWd+6bOXkKvHpFmMvKzxAtlhm6ZQKdAq
> +MlJ7wQDAQgHiHgEGBYKACAWIQQCzskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIb
> DAAKCRCZR31bPD+6ozWxAQC9OFisWrP/hHXUfj8AnC39r5pf5fEBz7lHvFgWNk2b
> XwD7Bl6kvIIW7ReqtgXvcl7u78vEo+e9YeTGTlmAogjpeQk=
> =rP+W
> -----END PGP PUBLIC KEY BLOCK-----
>
> ---
> libavformat/rtmpproto.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> index 846376e668..dd850f72ed 100644
> --- a/libavformat/rtmpproto.c
> +++ b/libavformat/rtmpproto.c
> @@ -347,6 +347,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
> if ((fourcc_str_len + 1) % 5 != 0) {
> av_log(s, AV_LOG_ERROR, "Malformed rtmp_enhanched_codecs, "
> "should be of the form hvc1[,av01][,vp09][,...]\n");
> + ff_rtmp_packet_destroy(&pkt);
> return AVERROR(EINVAL);
> }
>
> @@ -370,6 +371,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
> ff_amf_write_string(&p, fourcc);
> } else {
> av_log(s, AV_LOG_ERROR, "Unsupported codec fourcc, %.*s\n", 4, fourcc_data);
> + ff_rtmp_packet_destroy(&pkt);
> return AVERROR_PATCHWELCOME;
> }
LGTM.
>
> --
> 2.50.0.rc0.47.g9cc88feafa.dirty
>
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect()
2025-06-14 9:08 ` Zhao Zhili
@ 2025-06-15 23:37 ` Michael Niedermayer
2025-06-17 14:34 ` ld y
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2025-06-15 23:37 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 2481 bytes --]
On Sat, Jun 14, 2025 at 05:08:36PM +0800, Zhao Zhili wrote:
>
>
> > On Jun 14, 2025, at 16:33, Lidong Yan <yldhome2d2-at-gmail.com@ffmpeg.org> wrote:
> >
> > In libavformat/rtmpproto.c:gen_connect(), if check on string length
> > or check on codec fourcc failed, ff_rtmp_packet_create() allocated
> > data in pkt would leak. Add ff_rtmp_packet_destory before return error
> > code.
> >
> > Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
> >
> > -----BEGIN PGP PUBLIC KEY BLOCK-----
> >
> > mDMEaEpkmRYJKwYBBAHaRw8BAQdAGwGqH/Dwod+i6kR0/Rhn5GanJ7wK8mM9tWP/
> > W2qu8Ti0HTUwMjAyNDMzMDA1NkBzbWFpbC5uanUuZWR1LmNuiJkEExYKAEEWIQQC
> > zskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIbAwUJBaOagAULCQgHAgIiAgYVCgkI
> > CwIEFgIDAQIeBwIXgAAKCRCZR31bPD+6o8wHAQCLomsA4XfTd8IdG983gGULUJe/
> > 0432buy4nX7AsAc87QEA+/QIsWTR6XLJaLa1sLSQCsZkb86U3c17JzG9oivL8gW4
> > OARoSmSZEgorBgEEAZdVAQUBAQdAfYrEAWd+6bOXkKvHpFmMvKzxAtlhm6ZQKdAq
> > +MlJ7wQDAQgHiHgEGBYKACAWIQQCzskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIb
> > DAAKCRCZR31bPD+6ozWxAQC9OFisWrP/hHXUfj8AnC39r5pf5fEBz7lHvFgWNk2b
> > XwD7Bl6kvIIW7ReqtgXvcl7u78vEo+e9YeTGTlmAogjpeQk=
> > =rP+W
> > -----END PGP PUBLIC KEY BLOCK-----
> >
> > ---
> > libavformat/rtmpproto.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> > index 846376e668..dd850f72ed 100644
> > --- a/libavformat/rtmpproto.c
> > +++ b/libavformat/rtmpproto.c
> > @@ -347,6 +347,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
> > if ((fourcc_str_len + 1) % 5 != 0) {
> > av_log(s, AV_LOG_ERROR, "Malformed rtmp_enhanched_codecs, "
> > "should be of the form hvc1[,av01][,vp09][,...]\n");
> > + ff_rtmp_packet_destroy(&pkt);
> > return AVERROR(EINVAL);
> > }
> >
> > @@ -370,6 +371,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
> > ff_amf_write_string(&p, fourcc);
> > } else {
> > av_log(s, AV_LOG_ERROR, "Unsupported codec fourcc, %.*s\n", 4, fourcc_data);
> > + ff_rtmp_packet_destroy(&pkt);
> > return AVERROR_PATCHWELCOME;
> > }
>
> LGTM.
will apply
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect()
2025-06-15 23:37 ` Michael Niedermayer
@ 2025-06-17 14:34 ` ld y
0 siblings, 0 replies; 4+ messages in thread
From: ld y @ 2025-06-17 14:34 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Sorry I send this patch again. Please Ignore:
https://ffmpeg.org/pipermail/ffmpeg-devel/2025-June/345436.html
Thanks,
Lidong
Michael Niedermayer <michael@niedermayer.cc> 于2025年6月16日周一 07:38写道：
> On Sat, Jun 14, 2025 at 05:08:36PM +0800, Zhao Zhili wrote:
> >
> >
> > > On Jun 14, 2025, at 16:33, Lidong Yan <
> yldhome2d2-at-gmail.com@ffmpeg.org> wrote:
> > >
> > > In libavformat/rtmpproto.c:gen_connect(), if check on string length
> > > or check on codec fourcc failed, ff_rtmp_packet_create() allocated
> > > data in pkt would leak. Add ff_rtmp_packet_destory before return error
> > > code.
> > >
> > > Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
> > >
> > > -----BEGIN PGP PUBLIC KEY BLOCK-----
> > >
> > > mDMEaEpkmRYJKwYBBAHaRw8BAQdAGwGqH/Dwod+i6kR0/Rhn5GanJ7wK8mM9tWP/
> > > W2qu8Ti0HTUwMjAyNDMzMDA1NkBzbWFpbC5uanUuZWR1LmNuiJkEExYKAEEWIQQC
> > > zskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIbAwUJBaOagAULCQgHAgIiAgYVCgkI
> > > CwIEFgIDAQIeBwIXgAAKCRCZR31bPD+6o8wHAQCLomsA4XfTd8IdG983gGULUJe/
> > > 0432buy4nX7AsAc87QEA+/QIsWTR6XLJaLa1sLSQCsZkb86U3c17JzG9oivL8gW4
> > > OARoSmSZEgorBgEEAZdVAQUBAQdAfYrEAWd+6bOXkKvHpFmMvKzxAtlhm6ZQKdAq
> > > +MlJ7wQDAQgHiHgEGBYKACAWIQQCzskBcOehk1y8GoKZR31bPD+6owUCaEpkmQIb
> > > DAAKCRCZR31bPD+6ozWxAQC9OFisWrP/hHXUfj8AnC39r5pf5fEBz7lHvFgWNk2b
> > > XwD7Bl6kvIIW7ReqtgXvcl7u78vEo+e9YeTGTlmAogjpeQk=
> > > =rP+W
> > > -----END PGP PUBLIC KEY BLOCK-----
> > >
> > > ---
> > > libavformat/rtmpproto.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> > > index 846376e668..dd850f72ed 100644
> > > --- a/libavformat/rtmpproto.c
> > > +++ b/libavformat/rtmpproto.c
> > > @@ -347,6 +347,7 @@ static int gen_connect(URLContext *s, RTMPContext
> *rt)
> > > if ((fourcc_str_len + 1) % 5 != 0) {
> > > av_log(s, AV_LOG_ERROR, "Malformed rtmp_enhanched_codecs, "
> > > "should be of the form hvc1[,av01][,vp09][,...]\n");
> > > + ff_rtmp_packet_destroy(&pkt);
> > > return AVERROR(EINVAL);
> > > }
> > >
> > > @@ -370,6 +371,7 @@ static int gen_connect(URLContext *s, RTMPContext
> *rt)
> > > ff_amf_write_string(&p, fourcc);
> > > } else {
> > > av_log(s, AV_LOG_ERROR, "Unsupported codec fourcc,
> %.*s\n", 4, fourcc_data);
> > > + ff_rtmp_packet_destroy(&pkt);
> > > return AVERROR_PATCHWELCOME;
> > > }
> >
> > LGTM.
>
> will apply
>
> thx
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Those who are too smart to engage in politics are punished by being
> governed by those who are dumber. -- Plato
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-17 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-14 8:33 [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect() Lidong Yan
2025-06-14 9:08 ` Zhao Zhili
2025-06-15 23:37 ` Michael Niedermayer
2025-06-17 14:34 ` ld y
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