From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri, 3 Oct 2025 11:19:14 +0000 (+0200)
Subject: Revert "Merge !1743: contrib/mempattern: silence UBSAN on newer clang"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-revert-e970d-x4sh89%2Fdeployments%2F7685;p=thirdparty%2Fknot-resolver.git

Revert "Merge !1743: contrib/mempattern: silence UBSAN on newer clang"

This reverts merge request !1743
---

diff --git a/contrib/mempattern.c b/contrib/mempattern.c
index ea17eb866..e0c784de1 100644
--- a/contrib/mempattern.c
+++ b/contrib/mempattern.c
@@ -113,16 +113,10 @@ void mm_ctx_init(knot_mm_t *mm)
 	mm->free = free;
 }
 
-// UBSAN type punning workaround
-static void *mp_alloc_wrap(void *ctx, size_t size)
-{
-	return mp_alloc(ctx, size);
-}
-
 void mm_ctx_mempool(knot_mm_t *mm, size_t chunk_size)
 {
 	mm->ctx = mp_new(chunk_size);
-	mm->alloc = mp_alloc_wrap;
+	mm->alloc = (knot_mm_alloc_t)mp_alloc;
 	mm->free = mm_nofree;
 }