ffmpeg | branch: master | Marvin Scholz <epira...@gmail.com> | Tue Jul 8 17:09:01 2025 +0200| [7c91ae94198fd3dce7b9bed9d67096f0e5b5f260] | committer: Marvin Scholz
avformat/rtsp: check copy_tls_opts_dict Properly check av_dict_set return values and propagate them to the caller so they can be handled. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c91ae94198fd3dce7b9bed9d67096f0e5b5f260 --- libavformat/rtsp.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5ef6dad315..10355b89b8 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -143,18 +143,29 @@ static AVDictionary *map_to_opts(RTSPState *rt) return opts; } +#define ERR_RET(c) \ + do { \ + int ret = c; \ + if (ret < 0) \ + return ret; \ + } while (0) + /** * Add the TLS options of the given RTSPState to the dict */ -static void copy_tls_opts_dict(RTSPState *rt, AVDictionary **dict) +static int copy_tls_opts_dict(RTSPState *rt, AVDictionary **dict) { - av_dict_set_int(dict, "tls_verify", rt->tls_opts.verify, 0); - av_dict_set(dict, "ca_file", rt->tls_opts.ca_file, 0); - av_dict_set(dict, "cert_file", rt->tls_opts.cert_file, 0); - av_dict_set(dict, "key_file", rt->tls_opts.key_file, 0); - av_dict_set(dict, "verifyhost", rt->tls_opts.host, 0); + ERR_RET(av_dict_set_int(dict, "tls_verify", rt->tls_opts.verify, 0)); + ERR_RET(av_dict_set(dict, "ca_file", rt->tls_opts.ca_file, 0)); + ERR_RET(av_dict_set(dict, "cert_file", rt->tls_opts.cert_file, 0)); + ERR_RET(av_dict_set(dict, "key_file", rt->tls_opts.key_file, 0)); + ERR_RET(av_dict_set(dict, "verifyhost", rt->tls_opts.host, 0)); + + return 0; } +#undef ERR_RET + static void get_word_until_chars(char *buf, int buf_size, const char *sep, const char **pp) { @@ -1837,8 +1848,14 @@ redirect: AVDictionary *options = NULL; av_dict_set_int(&options, "timeout", rt->stimeout, 0); - if (https_tunnel) - copy_tls_opts_dict(rt, &options); + if (https_tunnel) { + int ret = copy_tls_opts_dict(rt, &options); + if (ret < 0) { + av_dict_free(&options); + err = ret; + goto fail; + } + } ff_url_join(httpname, sizeof(httpname), https_tunnel ? "https" : "http", auth, host, port, "%s", path); snprintf(sessioncookie, sizeof(sessioncookie), "%08x%08x", @@ -1927,8 +1944,14 @@ redirect: int ret; /* open the tcp connection */ AVDictionary *proto_opts = NULL; - if (strcmp("tls", lower_rtsp_proto) == 0) - copy_tls_opts_dict(rt, &proto_opts); + if (strcmp("tls", lower_rtsp_proto) == 0) { + ret = copy_tls_opts_dict(rt, &proto_opts); + if (ret < 0) { + av_dict_free(&proto_opts); + err = ret; + goto fail; + } + } ff_url_join(tcpname, sizeof(tcpname), lower_rtsp_proto, NULL, host, port, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
