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 092354EF2A for ; Thu, 19 Feb 2026 19:35:37 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'GRbjQVUhYxktOHSpB1X3O+caAClgtEoXGoD+oWJ2UuU=', expected b'FlrOJFZNvMWgDibx9bB/v0pdBdu1K7mqWGGOzxKXp+Y=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1771529728; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=GRbjQVUhYxktOHSpB1X3O+caAClgtEoXGoD+oWJ2UuU=; b=qgIiMM7SMG3sSvr5YQYzZa3PMV6l9ZNuJq1UB6HM6XQZLk7H8u8MeBqGqh9e+NlNWH1JI 6z66dhniv7wHZ7lHNoILX7odhPjgWYUbJFxXTLYJxVkWNtXVtjE2zdpQS9jDvrCi9+lsNIs z7ODSVpUmy50ht4A5G9/nybR/8kEBSCOC5GNBTD41ltZnoi/Y83TOawz8PpxtrtCm6sEMUX 78bIxs7gleIjz6OdIFLHRQa/X/rsYXTM1lVmcBcXNyn/CzXFZOR+CkL+Wp2xtZFQElbpatf OK7K/6JInzZjHAnrMBYeM4txxg29JHWN/TXSnea6VAg7zsGIqWs4ErRWfdsQ== Received: from [172.18.0.3] (unknown [172.18.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 226986912E0; Thu, 19 Feb 2026 21:35:28 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1771529716; b=BtpMgJGpDz8n+JyijPI7PKgt7Xch26AGNObb+wP8XpRSP2VK+x6HXLYy6fpS/BvpBJCIK 8xE+apOx3PahVDjzXYrjG72MCKVQwAdJXSrFnpuc1eoyvyGYOmrqhVKHhyoKjsMR7qw5ecu oVoLeIRCGkMGQUnXYeMN8LBsq8zhe7cNGMxRq8XUan3hNSrdIsdYZW7nRrc8tQJbR9/Ueou RsP6GBTM9LkJzwGZFqc4K8PNgYVhPJQAR6Cv/snOSYwMY2rjJSk+ux+BslqVYOkOiF1mdV5 yVq9Fe/5qF3AO5mEXMFtSDjz9MGV+dbYi9eCA6YkjYL9pm3pevOKT6OsaNoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1771529716; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=AMtJOP8TRX/L5x4LKZCIiGlzOCmGHZ/SorFrbzsSm8E=; b=E9fSQV9Kd/p6dtSE4kyQFEVwDB/YU8txC6ZqDmOmK03uzw0hBtimqEecpnDburEl9/1Ah bYxdDjtom3mczuQY2AtC9uMllADRiY6we2yW2NdSkRozMo+B92fbrhBVosqP5Gpx2WZZZpD 2i6TZQJh9ymihm6C8J5w9us8nTLUzKy+gxq5rxYDBiW5U9WPlAoRh0NE92/P96w9Wa61MOV alTT66/91Y/ppj/nser++yCHaLLzBE5oy1qdY1IRd1bTDv2LxG84I7Db6MNX1OZB2ybCOw3 F6j7udw2pAAXOXBE8TfR4ZoKVt2GsBLjbKiMtZbM5k+NUjwMhRDl95uMzodQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1771529708; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=FlrOJFZNvMWgDibx9bB/v0pdBdu1K7mqWGGOzxKXp+Y=; b=FtbyyfNcOLA5ueDzfNVzP37TtzKyRCm26IoR747ZsQagtek+odKM9aDcfImt3ZH9DN4OV Y1AvHKClzvYUYL0mX3ZBbHPPofGN3CD2maye6yFnxtB2HGstTbP2jXKBKnifCkx1DwfT0as 9P1TMIsFfWOgDjN3NPMoyFqJpRHBKvU+U6PXPQEHNLLE2/YvTEdPxtbz6lsCDb1dwYSvyVs 7Dnd5G14JfxHJgUk7ElI7Cb4ZZ3xmEEcq7eY4qpkzcp+3mfCMr7Yxbo2J5OFjnNxf1/T0X0 x31w/KAS2Opxum5LHA8zO+tYNsPiJlaRbPGgTitPwNc7ymIyvQetd/zyx0wg== MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Feb 2026 19:35:08 -0000 Message-ID: <177152970849.25.17553805234310938153@29965ddac10e> Message-ID-Hash: 2AEPQCC6IS5JUP6BMXT4ZWMTCMQVH6LA X-Message-ID-Hash: 2AEPQCC6IS5JUP6BMXT4ZWMTCMQVH6LA X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avformat: fix leaks in rtsp_read_command_reply and seq logging (PR #21805) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Marvin Scholz via ffmpeg-devel Cc: Marvin Scholz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21805 opened by Marvin Scholz (ePirat) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21805 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21805.patch >>From ee555af62a05ad8121d87bceba755f3c1ec6469d Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Thu, 19 Feb 2026 20:27:41 +0100 Subject: [PATCH 1/2] avformat: rtspdec: fix leaks in rtsp_read_command_reply Reorder to avoid allocation if there is nothing to read and also solve a memory leak in that case. Also make sure to free the RTSPMessageHeader, which is not passed to the caller. --- libavformat/rtspdec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 1fd50bf9be..c92df06b46 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -674,17 +674,21 @@ static int rtsp_read_command_reply(AVFormatContext *s, enum AVFormatCommandID id if (!data_out) return AVERROR(EINVAL); - AVRTSPResponse *res = av_malloc(sizeof(*res)); - if (!res) - return AVERROR(ENOMEM); - + unsigned char *body; RTSPMessageHeader *reply; - int ret = ff_rtsp_read_reply_async_stored(s, &reply, &res->body); + int ret = ff_rtsp_read_reply_async_stored(s, &reply, &body); if (ret < 0) return ret; + AVRTSPResponse *res = av_malloc(sizeof(*res)); + if (!res) { + av_free(body); + return AVERROR(ENOMEM); + } + res->status_code = reply->status_code; res->body_len = reply->content_length; + res->body = body; res->reason = av_strdup(reply->reason); if (!res->reason) { @@ -694,6 +698,7 @@ static int rtsp_read_command_reply(AVFormatContext *s, enum AVFormatCommandID id return AVERROR(ENOMEM); } + av_free(reply); *data_out = res; return 0; } -- 2.52.0 >>From 80ac2fca2beb31d5e3cbc025d2a2474e2f66cbd3 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Thu, 19 Feb 2026 20:28:19 +0100 Subject: [PATCH 2/2] avformat: rtsp: fix logging of reply sequence number --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 1362cb683b..822780087d 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1415,7 +1415,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, memcpy(rt->stored_msg.header, &header, sizeof(header)); } else { av_log(s, AV_LOG_WARNING, "Unexpected reply with seq %d, expected %d\n", - rt->stored_msg.header->seq, rt->stored_msg.expected_seq); + header.seq, rt->stored_msg.expected_seq); av_freep(&rt->stored_msg.body); } -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org