[FFmpeg-cvslog] lavf/hls: fix memory leak in error handling path for option tmp
Jun Zhao
git at videolan.org
Sat Sep 14 05:02:45 EEST 2019
ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Fri Sep 13 19:53:37 2019 +0800| [0c5726a332734d18821e03779f94d1af8e251641] | committer: Steven Liu
lavf/hls: fix memory leak in error handling path for option tmp
fix memory leak in error handling path for option tmp.
Reviewed-by: Steven Liu <lq at onvideo.cn>
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c5726a332734d18821e03779f94d1af8e251641
---
libavformat/hls.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index bb07dcb96c..0611ddc6bb 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -620,9 +620,6 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
int ret;
int is_http = 0;
- av_dict_copy(&tmp, opts, 0);
- av_dict_copy(&tmp, opts2, 0);
-
if (av_strstart(url, "crypto", NULL)) {
if (url[6] == '+' || url[6] == ':')
proto_name = avio_find_protocol_name(url + 7);
@@ -655,9 +652,13 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
return AVERROR_INVALIDDATA;
+ av_dict_copy(&tmp, opts, 0);
+ av_dict_copy(&tmp, opts2, 0);
+
if (is_http && c->http_persistent && *pb) {
ret = open_url_keepalive(c->ctx, pb, url);
if (ret == AVERROR_EXIT) {
+ av_dict_free(&tmp);
return ret;
} else if (ret < 0) {
if (ret != AVERROR_EOF)
More information about the ffmpeg-cvslog
mailing list