From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Sep 2019 04:19:24 +0000 (+0900)
Subject: Merge branch 'mh/http-urlmatch-cleanup'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f0fcab6deb0bdd005d4725b4377ea1471e2f07a0?hp=-c

Merge branch 'mh/http-urlmatch-cleanup'

Leakfix.

* mh/http-urlmatch-cleanup:
http: don't leak urlmatch_config.vars
---

f0fcab6deb0bdd005d4725b4377ea1471e2f07a0
diff --combined http.c
index 938b9e55af,9e33584f2d..027a86d75d
--- a/http.c
+++ b/http.c
@@@ -513,11 -513,9 +513,11 @@@ static void set_proxyauth_name_password
  #else
  		struct strbuf s = STRBUF_INIT;
  
 -		strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
 +		strbuf_addstr_urlencode(&s, proxy_auth.username,
 +					is_rfc3986_unreserved);
  		strbuf_addch(&s, ':');
 -		strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
 +		strbuf_addstr_urlencode(&s, proxy_auth.password,
 +					is_rfc3986_unreserved);
  		curl_proxyuserpwd = strbuf_detach(&s, NULL);
  		curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
  #endif
@@@ -1075,6 -1073,7 +1075,7 @@@ void http_init(struct remote *remote, c
  
  	git_config(urlmatch_config_entry, &config);
  	free(normalized_url);
+ 	string_list_clear(&config.vars, 1);
  
  #if LIBCURL_VERSION_NUM >= 0x073800
  	if (http_ssl_backend) {