[FFmpeg-devel] [PATCH] avformat/http: Stop cookie_dict leaking on errors.

Steven Liu lingjiujianke at gmail.com
Wed Jun 2 09:55:22 EEST 2021


Robert Bengtsson-Ölund <robert.bengtsson-olund at intinor.se>
于2021年6月2日周三 上午1:12写道:
>
> This solves the memory leak reported in https://trac.ffmpeg.org/ticket/9273
>
> Signed-off-by: Robert Bengtsson-Ölund <robert.bengtsson-olund at intinor.se>
> ---
>  libavformat/http.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/http.c b/libavformat/http.c
> index 1fc95c768c..476b9a8456 100644
> --- a/libavformat/http.c
> +++ b/libavformat/http.c
> @@ -605,6 +605,7 @@ static int http_listen(URLContext *h, const char *uri, int flags,
>      }
>  fail:
>      av_dict_free(&s->chained_options);
> +    av_dict_free(&s->cookie_dict);
>      return ret;
>  }
>
> @@ -645,8 +646,10 @@ static int http_open(URLContext *h, const char *uri, int flags,
>      }
>      ret = http_open_cnx(h, options);
>  bail_out:
> -    if (ret < 0)
> +    if (ret < 0) {
>          av_dict_free(&s->chained_options);
> +        av_dict_free(&s->cookie_dict);
> +    }
>      return ret;
>  }
>
> @@ -1763,6 +1766,7 @@ static int http_close(URLContext *h)
>      if (s->hd)
>          ffurl_closep(&s->hd);
>      av_dict_free(&s->chained_options);
> +    av_dict_free(&s->cookie_dict);
>      return ret;
>  }
>
> --
> 2.27.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".

LGTM


Thanks
Steven


More information about the ffmpeg-devel mailing list