From c963ca7542743c4b1293b245b8750bfdcdde7580 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Jul 2012 10:02:32 +1000 Subject: [PATCH] 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] --- CHANGES | 4 ++++ lib/isc/mem.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 4b4082548d..aa7d1f7c2a 100644 --- 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 fe3ade0fb4..8ca081cf8c 100644 --- 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; }