From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 1/1] remote-curl: unbreak http.extraHeader with custom allocators
Date: Wed, 06 Nov 2019 21:12:04 +0900 [thread overview]
Message-ID: <xmqq7e4dtd9n.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <3168ba2c9eadcf0cd7e4f2533c9306b5d2c627d0.1573034695.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 06 Nov 2019 10:04:55 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In 93b980e58f5 (http: use xmalloc with cURL, 2019-08-15), we started to
> ask cURL to use `xmalloc()`, and if compiled with nedmalloc, that means
> implicitly a different allocator than the system one.
>
> Which means that all of cURL's allocations and releases now _need_ to
> use that allocator.
>
> However, the `http_options()` function used `slist_append()` to add any
> configured extra HTTP header(s) _before_ asking cURL to use `xmalloc()`,
> and `http_cleanup()` would release them _afterwards_, i.e. in the
> presence of custom allocators, cURL would attempt to use the wrong
> allocator to release the memory.
s/allocator/de&/; perhaps, even though it is clear enough from the
context, so it is probably OK as is.
> A naïve attempt at fixing this would move the call to
> `curl_global_init()` _before_ the config is parsed (i.e. before that
> call to `slist_append()`).
>
> However, that does work, as we _also_ parse the config setting
s/does work/does not work/; presumably?
> `http.sslbackend` and if found, call `curl_global_sslset()` which *must*
> be called before `curl_global_init()`, for details see:
> https://curl.haxx.se/libcurl/c/curl_global_sslset.html
>
> So let's instead make the config parsing entirely independent from
> cURL's data structures. Incidentally, this deletes two more lines than
> it introduces, which is nice.
Yeah, string_list_clear() is more concise than curl_slist_free_all(),
and we have already been copying one list to another anyway, so we
lucked out ;-)
The patch looked good to me, too.
next prev parent reply other threads:[~2019-11-06 12:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 21:59 [PATCH 0/1] remote-curl: unbreak http.extraHeader with custom allocators Johannes Schindelin via GitGitGadget
2019-11-05 21:59 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
2019-11-06 4:16 ` Jeff King
2019-11-06 9:14 ` Johannes Schindelin
2019-11-06 9:49 ` Junio C Hamano
2019-11-06 19:38 ` Johannes Schindelin
2019-11-08 8:34 ` Junio C Hamano
2019-11-08 13:44 ` Johannes Schindelin
2019-11-06 10:04 ` [PATCH v2 0/1] " Johannes Schindelin via GitGitGadget
2019-11-06 10:04 ` [PATCH v2 1/1] " Johannes Schindelin via GitGitGadget
2019-11-06 11:29 ` Jeff King
2019-11-06 12:12 ` Junio C Hamano [this message]
2019-11-06 19:34 ` Johannes Schindelin
2019-11-07 5:39 ` Junio C Hamano
2019-11-07 12:40 ` Johannes Schindelin
2019-11-08 3:03 ` Junio C Hamano
2019-11-06 12:15 ` [PATCH v2 0/1] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7e4dtd9n.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).