3351. [bug] isc_mem_put and isc_mem_putanddetach didn't report

                        caller if either ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX
                        memory debugging flags are set. [RT #30243]

diff --git a/CHANGES b/CHANGES
index 4b4082548d68856f3d7ccdbccdb3005a2bf3b311..aa7d1f7c2a33609bc57150fed997781394312e8d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3351.  [bug]           isc_mem_put and isc_mem_putanddetach didn't report
+                       caller if either ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX
+                       memory debugging flags are set. [RT #30243]
+
 3350.  [bug]           Memory read overrun in isc___mem_reallocate if
                        ISC_MEM_DEBUGCTX memory debugging flag is set.
                        [RT #30240]

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index fe3ade0fb40a0deeed8436685a1224726c74c366..8ca081cf8c32be3cca5aa366ba966da767e103aa 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1197,7 +1197,7 @@ isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) {
                                oldsize -= ALIGNMENT_SIZE;
                        INSIST(oldsize == size);
                }
-               isc_mem_free((isc_mem_t *)ctx, ptr);
+               isc__mem_free((isc_mem_t *)ctx, ptr FLARG_PASS);
 
                MCTXLOCK(ctx, &ctx->lock);
                ctx->references--;
@@ -1333,7 +1333,7 @@ isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) {
                                oldsize -= ALIGNMENT_SIZE;
                        INSIST(oldsize == size);
                }
-               isc_mem_free((isc_mem_t *)ctx, ptr);
+               isc__mem_free((isc_mem_t *)ctx, ptr FLARG_PASS);
                return;
        }