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 6fcf53d8c3c53966251b1af4154ea8a38da7fa8c..ecc39a5425c149c5b448ce877a23db7ab7ceeba2 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 271ead3fe797706c13a23613791d3ad979435e73..a2dcd3eea88e31d9e336ce505faec9ccd4cf4b50 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1191,7 +1191,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--;
@@ -1327,7 +1327,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;
        }