X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=6b93e2a93bab0daf16e0c20c990fa871d7b005c7;hb=74faf510afbc0c3130035a7002cf5bc0d6d8fdcc;hp=df3b5c8a67cffa70c0dc26258ba2830950d5bf5f;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;p=wimlib

diff --git a/src/util.c b/src/util.c
index df3b5c8a..6b93e2a9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -407,9 +407,33 @@ wimlib_get_error_string(enum wimlib_error_code code)
 
 
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
-void *(*wimlib_malloc_func) (size_t)	     = malloc;
-void  (*wimlib_free_func)   (void *)	     = free;
-void *(*wimlib_realloc_func)(void *, size_t) = realloc;
+static void *(*wimlib_malloc_func) (size_t)	     = malloc;
+static void  (*wimlib_free_func)   (void *)	     = free;
+static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
+
+void *
+wimlib_malloc(size_t size)
+{
+	void *ptr = (*wimlib_malloc_func)(size);
+	if (ptr == NULL && size != 0)
+		ERROR("memory exhausted");
+	return ptr;
+}
+
+void
+wimlib_free_memory(void *ptr)
+{
+	(*wimlib_free_func)(ptr);
+}
+
+void *
+wimlib_realloc(void *ptr, size_t size)
+{
+	ptr = (*wimlib_realloc_func)(ptr, size);
+	if (ptr == NULL && size != 0)
+		ERROR("memory exhausted");
+	return ptr;
+}
 
 void *
 wimlib_calloc(size_t nmemb, size_t size)
@@ -417,7 +441,7 @@ wimlib_calloc(size_t nmemb, size_t size)
 	size_t total_size = nmemb * size;
 	void *p = MALLOC(total_size);
 	if (p)
-		memset(p, 0, total_size);
+		p = memset(p, 0, total_size);
 	return p;
 }
 
@@ -430,7 +454,7 @@ wimlib_strdup(const char *str)
 	size = strlen(str);
 	p = MALLOC(size + 1);
 	if (p)
-		memcpy(p, str, size + 1);
+		p = memcpy(p, str, size + 1);
 	return p;
 }
 
@@ -444,13 +468,22 @@ wimlib_wcsdup(const wchar_t *str)
 	size = wcslen(str);
 	p = MALLOC((size + 1) * sizeof(wchar_t));
 	if (p)
-		memcpy(p, str, (size + 1) * sizeof(wchar_t));
+		p = wmemcpy(p, str, size + 1);
 	return p;
 }
 #endif
 
 #endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
 
+void *
+memdup(const void *mem, size_t size)
+{
+	void *ptr = MALLOC(size);
+	if (ptr)
+		ptr = memcpy(ptr, mem, size);
+	return ptr;
+}
+
 WIMLIBAPI int
 wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
 			    void (*free_func)(void *),