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 619D34CEA2 for ; Sat, 14 Jun 2025 08:34:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9C4DF68CC57; Sat, 14 Jun 2025 11:34:04 +0300 (EEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C826868BECB for ; Sat, 14 Jun 2025 11:33:57 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id 41be03b00d2f7-b26df8f44e6so3001074a12.2 for ; Sat, 14 Jun 2025 01:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749890035; x=1750494835; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bXEmlSBoc59w9OAw0rOr412/+PFAOv7CqbaHjVDajlk=; b=H4orAihW2KmbWbj7rkfX9vaGwC9MJOFuEhqKtPXxgyaPC7b6TVlOi285LGVZ3ZncWJ amUz1aStnf6l/8aIwANye3CXuq5BwtnYM6urYJYhMHH17lYmGYHJHRj2q3dlWVenTN8l FjmO153jxFCBA/sa/DQrhFmJAqBBUIjOe9xr1/KeO7DPce69Jv22X32Q9ECXoH4WlYKb JScUe/DEa/KR/yF1AC4LBxsfBhu5NYv5AxEoY9KzH7AmjOwku9s0k4OfGKqnNau0DXHr Nb6NNx1Iqw44dTmcqRNCLD1b07gXHGWN1dKpw2LWb7d543P5e9kUBSZgGmbbXvO5toU9 qcHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749890035; x=1750494835; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bXEmlSBoc59w9OAw0rOr412/+PFAOv7CqbaHjVDajlk=; b=YRJ5Ue0B/mhRmDgKeC1FxprMUKnlmzx2q+C1sxrwIFkmruqNf/cPSRh9hObCfnwq3D LPCHE6y0And2fgT1WjJzTE+oFQx8zARP/FNcgu1/6E0/3VbiRAEfaxM+N/cOy59pmw9M P/1RyXHcb/3Dgbn8vZbxQCgRSB5HtSCQsIJHT6YuHZAtBBDx4xK3oJZS+inYByeWWoEM 9mcKJRdDZxDlwbRN8zZ2QCIrTgWWXf3qu9AHrvG0lPKmlSD9gBr+ND6hFuoWSA511IRZ hkovvn5+oJTYPJoI5G0v2yKsYhyvRqmHumwSISrILQK4hsCvr3FhJwSzIEs31ATnOcVh +smw== X-Gm-Message-State: AOJu0YwrZFDZIyzYHN7Pdkf0t9L/PUtRNr96AKczLc2B9sw1UdHArIRe HUltJFE+cl2WiRyEKfScFUXdn34eFbFqb49YAZhYD1EBUV8VmFig0WInKoT/MO+m2VJYdaDG X-Gm-Gg: ASbGncvr48hrsGDUsJZVIn7mBbnPWPChPcOSnW23sQQURKippWpsAwneTbBAphMn7IO W5yDJlXZ3GRLAQfi+BVOH4/FV2G7VkmFyDezh7lVq8rIUgvrgLw0R+DUsgfD6I1Kj/+EJQQAJCa vQLAoq4D88hKHabUP9gIjcUhgUQKD9YzyA1ZWOOIHg+rBNDc1dMQvYzAitOtD46UCFXOa9oIV/j pklY3IM0QEWBaZbncylgtZ3tVKERFPuPJnVs+cy8SzPCvwgnGVGPskaN15Lc3+LZW8URVzfDRag ZZA/Nlqml9W9+krDMSOVIiRXuO0XO3QmcDp6EddYi26MiTRBXI/rOVu831Nv94g146OZJGka9kn 4egg= X-Google-Smtp-Source: AGHT+IGCi7sf4cyR05uz1Uc3O41eU9RP47NhUEOCgXDKEHzOYZc/8iQKOEpfx6isANE5cfkM9ADt0g== X-Received: by 2002:a17:90b:2f4e:b0:312:e731:5a66 with SMTP id 98e67ed59e1d1-313f1ca786dmr3699864a91.3.1749890035156; Sat, 14 Jun 2025 01:33:55 -0700 (PDT) Received: from r760 ([188.253.126.207]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c19dcd05sm5235089a91.14.2025.06.14.01.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jun 2025 01:33:54 -0700 (PDT) From: Lidong Yan X-Google-Original-From: Lidong Yan <502024330056@smail.nju.edu.cn> To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Jun 2025 16:33:50 +0800 Message-ID: <20250614083350.325419-1-502024330056@smail.nju.edu.cn> X-Mailer: git-send-email 2.50.0-rc2 MIME-Version: 1.0 Subject: [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: 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".