Re: [RFC PATCH] http: use xmalloc with cURL
flat view
From: Johannes Schindelin <hidden>
Date: 2019-08-11 11:20:31
Hi, On Sat, 10 Aug 2019, Carlo Marcelo Arenas Belón wrote:
4a30976e28 ([PATCH] support older versions of libcurl, 2005-07-28) added support for conditionally initializing cURL but when f0ed8226c9 (Add custom memory allocator to MinGW and MacOS builds, 2009-05-31) that support wasn't updated to make sure cURL will use the same allocator than git if compiled with USE_NED_ALLOCATOR=YesPlease (usually done in Windows) tested in macOS 10.14.6 with the system provided cURL (7.54.0) and latest (7.65.3) and while the API used should be added starting around 7.12.0 (mid 2014). couldn't get a release that old to build and therefore the current mismatch is unlikely to be found while testing because of that. cURL is very strict about its allocator being thread safe and so that might be an issue to look for.
Looks good to me. Please note that this did not cause problems in Git for Windows. Probably because we leave it to cURL to deallocate whatever it allocated. Still, it is a good idea to ask libcurl to use the same allocator as Git. Thanks, Dscho
quoted hunk ↗ jump to hunk
Signed-off-by: Carlo Marcelo Arenas Belón <redacted> --- http.h | 3 +++ 1 file changed, 3 insertions(+)diff --git a/http.h b/http.h index b429f1cf04..59ec4cbd30 100644 --- a/http.h +++ b/http.h@@ -27,6 +27,9 @@ #endif #if LIBCURL_VERSION_NUM < 0x070800 #define curl_global_init(a) do { /* nothing */ } while (0) +#else +#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \ + xrealloc, xstrdup, xcalloc) #endif #if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000) --2.23.0.rc2