[FFmpeg-devel] [PATCH] avformat/rtsp: fix leak of options dict on error

[FFmpeg-devel] [PATCH] avformat/rtsp: fix leak of options dict on error

[Marvin Scholz]

Fix CID 1655306
---
 libavformat/rtsp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 8d360b375f..0810c56a8b 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1847,6 +1847,7 @@ redirect:
         /* GET requests */
         if (ffurl_alloc(&rt->rtsp_hd, httpname, AVIO_FLAG_READ,
                         &s->interrupt_callback) < 0) {
+            av_dict_free(&options);
             err = AVERROR(EIO);
             goto fail;
         }
@@ -1863,6 +1864,7 @@ redirect:
         if (!rt->rtsp_hd->protocol_whitelist && s->protocol_whitelist) {
             rt->rtsp_hd->protocol_whitelist = av_strdup(s->protocol_whitelist);
             if (!rt->rtsp_hd->protocol_whitelist) {
+                av_dict_free(&options);
                 err = AVERROR(ENOMEM);
                 goto fail;
             }
@@ -1878,6 +1880,7 @@ redirect:
         /* POST requests */
         if (ffurl_alloc(&rt->rtsp_hd_out, httpname, AVIO_FLAG_WRITE,
                         &s->interrupt_callback) < 0 ) {
+            av_dict_free(&options);
             err = AVERROR(EIO);
             goto fail;
         }
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avformat/rtsp: fix leak of options dict on error

[Kieran Kunhya via ffmpeg-devel]

[-- Attachment #1: Type: message/rfc822, Size: 4621 bytes --]

From: Kieran Kunhya <kieran618@googlemail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] avformat/rtsp: fix leak of options dict on error
Date: Tue, 8 Jul 2025 19:33:29 +0100
Message-ID: <CABGuwEnwMJf7vxwXjvFK3HYozQV5RGE7Ye_dDp8UT43ERr4rbg@mail.gmail.com>

On Tue, 8 Jul 2025, 19:15 Marvin Scholz, <epirat07-at-gmail.com@ffmpeg.org>
wrote:

> Fix CID 1655306
> ---
>  libavformat/rtsp.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index 8d360b375f..0810c56a8b 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -1847,6 +1847,7 @@ redirect:
>          /* GET requests */
>          if (ffurl_alloc(&rt->rtsp_hd, httpname, AVIO_FLAG_READ,
>                          &s->interrupt_callback) < 0) {
> +            av_dict_free(&options);
>              err = AVERROR(EIO);
>              goto fail;
>          }
> @@ -1863,6 +1864,7 @@ redirect:
>          if (!rt->rtsp_hd->protocol_whitelist && s->protocol_whitelist) {
>              rt->rtsp_hd->protocol_whitelist =
> av_strdup(s->protocol_whitelist);
>              if (!rt->rtsp_hd->protocol_whitelist) {
> +                av_dict_free(&options);
>                  err = AVERROR(ENOMEM);
>                  goto fail;
>              }
> @@ -1878,6 +1880,7 @@ redirect:
>          /* POST requests */
>          if (ffurl_alloc(&rt->rtsp_hd_out, httpname, AVIO_FLAG_WRITE,
>                          &s->interrupt_callback) < 0 ) {
> +            av_dict_free(&options);
>              err = AVERROR(EIO);
>              goto fail;
>          }
> --
> 2.39.5 (Apple Git-154)
>

Lgtm

>

[-- 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".