Merge pull request #4613 from nidu-ninja/null-deref-custom-calloc

Fix potential NULL pointer dereference in ZSTD_customCalloc when cust…
2026-03-16 09:37:07 -07:00
parent c84c8fb47f 3f8f9b3f89
commit e56865641e
1 changed files with 6 additions and 2 deletions
@@ -33,9 +33,13 @@ MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem)
 MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
 {
    if (customMem.customAlloc) {
-        /* calloc implemented as malloc+memset;
-         * not as efficient as calloc, but next best guess for custom malloc */
+        /* calloc implemented as malloc+memset */
        void* const ptr = customMem.customAlloc(customMem.opaque, size);
+
+        if (ptr == NULL) {
+            return NULL;
+        }
+
        ZSTD_memset(ptr, 0, size);
        return ptr;
    }