Merge pull request #4724 from libgit2/cmn/allocator-init-order

alloc: don't overwrite allocator during init if set

Merge pull request #4724 from libgit2/cmn/allocator-init-order
alloc: don't overwrite allocator during init if set
ee3baed1 · Carlos Martín Nieto · GitHub · 2510268a · 19007b19 · ee3baed1
Unverified Commit ee3baed1 authored Jul 15, 2018 by Carlos Martín Nieto Committed by GitHub Jul 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/alloc.c
+7 -0

No files found.
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -17,6 +17,13 @@ git_allocator git__allocator;

 int git_allocator_global_init(void)
 {
+	/*
+	 * We don't want to overwrite any allocator which has been set before
+	 * the init function is called.
+	 */
+	if (git__allocator.gmalloc != NULL)
+		return 0;
+
 #if defined(GIT_MSVC_CRTDBG)
 	return git_win32_crtdbg_init_allocator(&git__allocator);
 #else