On Fri, Apr 05, 2019 at 01:20:31AM -0700, Jun Li wrote:
> stimeout option is already used in tcp transport, since
> http is based on tcp, pass the option to http for tunneling
> case.
> ---
> libavformat/rtsp.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index 033095905d..2ca1aca94e 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -1744,6 +1744,9 @@ redirect:
> char httpname[1024];
> char sessioncookie[17];
> char headers[1024];
> + AVDictionary *options = NULL;
> +
> + av_dict_set_int(&options, "timeout", rt->stimeout, 0);
>
> ff_url_join(httpname, sizeof(httpname), https_tunnel ? "https" :
> "http", auth, host, port, "%s", path);
> snprintf(sessioncookie, sizeof(sessioncookie), "%08x%08x",
> @@ -1774,7 +1777,7 @@ redirect:
> }
>
> /* complete the connection */
> - if (ffurl_connect(rt->rtsp_hd, NULL)) {
> + if (ffurl_connect(rt->rtsp_hd, &options)) {
> err = AVERROR(EIO);
> goto fail;
> }
> @@ -1818,10 +1821,11 @@ redirect:
> ff_http_init_auth_state(rt->rtsp_hd_out, rt->rtsp_hd);
>
> /* complete the connection */
> - if (ffurl_connect(rt->rtsp_hd_out, NULL)) {
> + if (ffurl_connect(rt->rtsp_hd_out, &options)) {
> err = AVERROR(EIO);
> goto fail;
> }
> + av_dict_free(&options);wouldnt this leak options on the error path ? [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The misfortune of the wise is better than the prosperity of the fool. -- Epicurus
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
