From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Lidong Yan <502024330056@smail.nju.edu.cn>
Subject: Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect()
Date: Sat, 14 Jun 2025 17:08:36 +0800
Message-ID: <tencent_8D34D980BA34BB3EED56059D3AE0305A3609@qq.com> (raw)
In-Reply-To: <20250614083350.325419-1-502024330056@smail.nju.edu.cn>
> 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".
next prev parent reply other threads:[~2025-06-14 9:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-14 8:33 Lidong Yan
2025-06-14 9:08 ` Zhao Zhili [this message]
2025-06-15 23:37 ` Michael Niedermayer
2025-06-17 14:34 ` ld y
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=tencent_8D34D980BA34BB3EED56059D3AE0305A3609@qq.com \
--to=quinkblack-at-foxmail.com@ffmpeg.org \
--cc=502024330056@smail.nju.edu.cn \
--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