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

alloc: don't overwrite allocator during init if set

1 files changed, 7 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 35fdd00c4..d4e6f1ebd 100644
--- 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