From 2ecd7f96489b442b08fec78dc4f8217a36282dc4 Mon Sep 17 00:00:00 2001 From: Marion Guthmuller Date: Tue, 9 Oct 2012 01:00:44 +0200 Subject: [PATCH 1/1] check if free on fragment already free --- src/xbt/mmalloc/mfree.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c index 64e098259e..b264ec381d 100644 --- a/src/xbt/mmalloc/mfree.c +++ b/src/xbt/mmalloc/mfree.c @@ -11,6 +11,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "mmprivate.h" +#include "xbt/ex.h" /* Return memory to the heap. Like `mfree' but don't call a mfree_hook if there is one. */ @@ -39,8 +40,7 @@ void mfree(struct mdesc *mdp, void *ptr) switch (type) { case -1: /* Already free */ - fprintf(stderr,"Asked to free a fragment in a block that is already free. I'm puzzled\n"); - abort(); + THROWF(system_error, 0, "Asked to free a fragment in a block that is already free. I'm puzzled\n"); break; case 0: @@ -151,6 +151,10 @@ void mfree(struct mdesc *mdp, void *ptr) /* Set size used in the fragment to 0 */ frag_nb = RESIDUAL(ptr, BLOCKSIZE) >> type; + + if( mdp->heapinfo[block].busy_frag.frag_size[frag_nb] == 0) + THROWF(system_error, 0, "Asked to free a fragment that is already free. I'm puzzled\n"); + mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = 0; if (mdp->heapinfo[block].busy_frag.nfree == -- 2.20.1