Commit 305e801acb2b13dca4e08ad00c638c22337c25bf
2018-10-21T09:52:32
util: allow callers to reset custom allocators Provide a utility to reset custom allocators back to their default. This is particularly useful for testing.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/include/git2/common.h b/include/git2/common.h
index a14e096..152e23a 100644
--- a/include/git2/common.h
+++ b/include/git2/common.h
@@ -364,7 +364,8 @@ typedef enum {
*
* > Set the memory allocator to a different memory allocator. This
* > allocator will then be used to make all memory allocations for
- * > libgit2 operations.
+ * > libgit2 operations. If the given `allocator` is NULL, then the
+ * > system default will be restored.
*
* opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, int enabled)
*
diff --git a/src/alloc.c b/src/alloc.c
index d4e6f1e..0cac457 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -15,6 +15,15 @@
git_allocator git__allocator;
+static int setup_default_allocator(void)
+{
+#if defined(GIT_MSVC_CRTDBG)
+ return git_win32_crtdbg_init_allocator(&git__allocator);
+#else
+ return git_stdalloc_init_allocator(&git__allocator);
+#endif
+}
+
int git_allocator_global_init(void)
{
/*
@@ -24,15 +33,14 @@ int git_allocator_global_init(void)
if (git__allocator.gmalloc != NULL)
return 0;
-#if defined(GIT_MSVC_CRTDBG)
- return git_win32_crtdbg_init_allocator(&git__allocator);
-#else
- return git_stdalloc_init_allocator(&git__allocator);
-#endif
+ return setup_default_allocator();
}
int git_allocator_setup(git_allocator *allocator)
{
+ if (!allocator)
+ return setup_default_allocator();
+
memcpy(&git__allocator, allocator, sizeof(*allocator));
return 0;
}