From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 25 Jan 2022 04:58:54 +0000 (-0800)
Subject: Bypass memory alignment compensation if not using custom allocator.
X-Git-Tag: 2.1.0-beta1~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d9b164550ce9542c1987fb3903cc227b4bd3a6;p=thirdparty%2Fzlib-ng.git

Bypass memory alignment compensation if not using custom allocator.
---

diff --git a/zutil.c b/zutil.c
index 20f5ac12..c3ef19f5 100644
--- a/zutil.c
+++ b/zutil.c
@@ -117,6 +117,10 @@ void Z_INTERNAL *zng_calloc_aligned(zng_calloc_func zalloc, void *opaque, unsign
     int32_t alloc_size, align_diff;
     void *ptr;
 
+    /* If no custom calloc function used then call zlib-ng's aligned calloc */
+    if (zalloc == zng_calloc)
+        return zng_calloc(opaque, items, size);
+
     /* Allocate enough memory for proper alignment and to store the original memory pointer */
     alloc_size = sizeof(void *) + (items * size) + align;
     ptr = zalloc(opaque, 1, alloc_size);
@@ -138,6 +142,11 @@ void Z_INTERNAL *zng_calloc_aligned(zng_calloc_func zalloc, void *opaque, unsign
 }
 
 void Z_INTERNAL zng_cfree_aligned(zng_cfree_func zfree, void *opaque, void *ptr) {
+    /* If no custom cfree function used then call zlib-ng's aligned cfree */
+    if (zfree == zng_cfree) {
+        zng_cfree(opaque, ptr);
+        return;
+    }
     if (!ptr)
         return;