From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id EFFCD4EFF5 for ; Sat, 14 Jun 2025 09:09:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 45AD568CA76; Sat, 14 Jun 2025 12:09:12 +0300 (EEST) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 628CB68BEBF for ; Sat, 14 Jun 2025 12:09:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1749892135; bh=tUuACfY1oV0DCRuhncIDeJdf46EcRFMLah9LkCCK+sc=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=UNegsuO0cEC8oKIQNVpJzHwUq1g0keg7zRVG427/hVOWl7QBQ6fJtRCw9pb2Ok+un FqpG2/bztjONO6bpGK4myMbiwLSqthMl68V6AlqTy0GAL/6xat256NsFdksUKxbABC q8eRqYMVJeU1pZ7bRunA7SsBj4x+odjcTiKGm6Ow= Received: from smtpclient.apple ([240e:3b7:3272:5600:fd13:73dd:1d9d:5525]) by newxmesmtplogicsvrsza36-0.qq.com (NewEsmtp) with SMTP id 234B7E11; Sat, 14 Jun 2025 17:08:52 +0800 X-QQ-mid: xmsmtpt1749892132t80fso4w4 Message-ID: X-QQ-XMAILINFO: NOcEdvLhLw8T439Cw4e2fqSL5FreeSZeb7j4vI7xdH7DhxiNWICSD/xXf2SE5H h4CA9bAOHPHK3ew3FMTp7xFKLjB1/7mDH+UTG6fEDkHENURpEefbUADSqfpkf6MlXjR39gszOdGX tyg8df4qNZvn8/TdVA5ROX7UTzyvJr+/MJQqR/sBRBztrrgHylNWbRenmgJeyv+v2VixHqlpZBNS v6XpjQiTfDG3IGSIwDbDxWAZQPAeG6Xhy4+62wj0WU64AcLDqVyrUbHR9Y/yUECq9QT4uRk/YLjS +9uyMyV1sSkGL3tbotADHNjmlhwmrgP73g7XVwETMtGcj5pB9HgLyI8xhXq6c0qIIklm9tKot0Mr vKjJ/QeCp8+HWc0pOX8ftwxNBYB0v0h4G1jm1b7MtMv4M3jTLr6s/rFUPwOORYJ3VZYqaiCn0kSx 0D0KpwixAG+NSBa2czwqoErPBQnCYPGy7COl1Qo57o2Em0KY2G3QBa3Atbw6b9bMxxjxIGqZWVDH nkeki0SVL4/HmwctsSv3ksRZLmEaYBuE7Lnkaed5vsRXYxxLzFZHs7VW5NQvK+c0gBbU4lAokMhN EIV9wMfLgbdJoO4uWTCHs1iY8pl389M1kGlYCOABzyjMT91ebWjra3SnF+RyCeOs968z5pT7jsfq RkGrTEresFe04X/7qo9hwXQxnCldWSRsOKt530Yl3cjFKq/L2sxx0Fe8WF7HIDrQ5FZlojvGnMeI bh02axe1me/+riqjOcG8q0IksrZIj0uq1w/ZXA1wq2XBg9lzomKSjTA49YcPEGOvQPYbE/x66iFi SKrGgHJTnfMsDpkSXTUoXK21BF0jwu6dY5Zyv89kIIyzLyCse0BGP/YDhvuBQ2Laq+LBlaOGiD7h w3c9i3iwDNDBSzPDPrUYwe9mfZD0om6lznCsDvnG2e0ye//ozDBCxwOMQU9QVzshhVyobEBXGgDs l0McUeVt10418m9crVerULo2LfW3oNLiKOVJDhylY9FRWPg17D1zDgC5O/e0fqMbsO8hMiNKB3Sk VZnigVh7HI2K31FVUuUB75Auwh5le/bWAct3pMZ4P8aA7URBgnPH1xWDE7H3k= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) From: Zhao Zhili In-Reply-To: <20250614083350.325419-1-502024330056@smail.nju.edu.cn> Date: Sat, 14 Jun 2025 17:08:36 +0800 X-OQ-MSGID: <8A69E789-F834-46AB-936F-0A0546838EE1@foxmail.com> References: <20250614083350.325419-1-502024330056@smail.nju.edu.cn> To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3818.100.11.1.3) Subject: Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: fix rmtp packet leak in gen_connect() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Lidong Yan <502024330056@smail.nju.edu.cn> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Jun 14, 2025, at 16:33, Lidong Yan 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".