From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7813C4360F for ; Sat, 18 Jun 2022 22:40:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5091068B5A5; Sun, 19 Jun 2022 01:40:46 +0300 (EEST) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BF9E68B00F for ; Sun, 19 Jun 2022 01:40:39 +0300 (EEST) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 25IMecDH027369-25IMecDI027369 for ; Sun, 19 Jun 2022 01:40:38 +0300 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id E625FA142E for ; Sun, 19 Jun 2022 01:40:38 +0300 (EEST) Date: Sun, 19 Jun 2022 01:40:38 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20220617093141.9826-4-nil-admirari@mailo.com> Message-ID: <17d5cd6e-56d3-3a0-7c8c-399cda2c6b1@martin.st> References: <20220617093141.9826-1-nil-admirari@mailo.com> <20220617093141.9826-4-nil-admirari@mailo.com> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH v17 4/5] libavformat: Remove MAX_PATH limit and use UTF-8 version of getenv() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 17 Jun 2022, Nil Admirari wrote: > 1. getenv() is replaced with getenv_utf8() across libavformat. > 2. New versions of AviSynth+ are now called with UTF-8 filenames. > 3. Old versions of AviSynth are still using ANSI strings, > but MAX_PATH limit on filename is removed. > --- > libavformat/avisynth.c | 39 +++++++++++++++++++++++++++------------ > libavformat/http.c | 20 +++++++++++++------- > libavformat/ipfsgateway.c | 35 +++++++++++++++++++++++------------ > libavformat/tls.c | 11 +++++++++-- > 4 files changed, 72 insertions(+), 33 deletions(-) > > @@ -198,6 +199,7 @@ void ff_http_init_auth_state(URLContext *dest, const URLContext *src) > static int http_open_cnx_internal(URLContext *h, AVDictionary **options) > { > const char *path, *proxy_path, *lower_proto = "tcp", *local_path; > + char *env_http_proxy, *env_no_proxy; > char *hashmark; > char hostname[1024], hoststr[1024], proto[10]; > char auth[1024], proxyauth[1024] = ""; > @@ -211,9 +213,13 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) > path1, sizeof(path1), s->location); > ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); > > - proxy_path = s->http_proxy ? s->http_proxy : getenv("http_proxy"); > - use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) && > + env_http_proxy = getenv_utf8("http_proxy"); > + proxy_path = s->http_proxy ? s->http_proxy : env_http_proxy; > + > + env_no_proxy = getenv_utf8("no_proxy"); > + use_proxy = !ff_http_match_no_proxy(env_no_proxy, hostname) && > proxy_path && av_strstart(proxy_path, "http://", NULL); > + av_freep(&env_no_proxy); > > if (!strcmp(proto, "https")) { > lower_proto = "tls"; > @@ -224,7 +230,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) > if (s->http_proxy) { > err = av_dict_set(options, "http_proxy", s->http_proxy, 0); > if (err < 0) > - return err; > + goto end; > } > } > if (port < 0) > @@ -259,12 +265,12 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) > err = ffurl_open_whitelist(&s->hd, buf, AVIO_FLAG_READ_WRITE, > &h->interrupt_callback, options, > h->protocol_whitelist, h->protocol_blacklist, h); > - if (err < 0) > - return err; > } > > - return http_connect(h, path, local_path, hoststr, > - auth, proxyauth); > +end: > + av_freep(&env_http_proxy); > + return err < 0 ? err : http_connect( > + h, path, local_path, hoststr, auth, proxyauth); > } FWIW - I wasn't entirely sure we can conclude that we always pass through a case that initializes the err variable here, so just to be sure, I locally amended this patch to initialize the err variable to 0 too. // Martin _______________________________________________ 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".