From 5ace292cc187782d31cc45adda473562aa5b4847 Mon Sep 17 00:00:00 2001 From: Andrew Friedley Date: Wed, 7 Jun 2006 15:52:48 +0000 Subject: [PATCH] Should fix ticket #81 - which is specific to MVAPI, I've included the same fix for gm/openib as well. uDAPL has the same problem, will fix in separate commit so it doesn't go to branch. This commit was SVN r10243. --- ompi/mca/mpool/gm/mpool_gm_module.c | 2 +- ompi/mca/mpool/mvapi/mpool_mvapi_module.c | 2 +- ompi/mca/mpool/openib/mpool_openib_module.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ompi/mca/mpool/gm/mpool_gm_module.c b/ompi/mca/mpool/gm/mpool_gm_module.c index 5383488003..0b0a0adece 100644 --- a/ompi/mca/mpool/gm/mpool_gm_module.c +++ b/ompi/mca/mpool/gm/mpool_gm_module.c @@ -167,8 +167,8 @@ void mca_mpool_gm_free(mca_mpool_base_module_t* mpool, void * addr, { if(registration){ mpool->mpool_deregister(mpool, registration); + free(addr); } - free(addr); } int mca_mpool_gm_find( diff --git a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c index 055f705cc4..9c49642ead 100644 --- a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c +++ b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c @@ -199,8 +199,8 @@ void mca_mpool_mvapi_free(mca_mpool_base_module_t* mpool, void * addr, { if(registration){ mpool->mpool_deregister(mpool, registration); + free(registration->alloc_base); } - free(registration->alloc_base); } diff --git a/ompi/mca/mpool/openib/mpool_openib_module.c b/ompi/mca/mpool/openib/mpool_openib_module.c index ea5988ae97..47c3185c60 100644 --- a/ompi/mca/mpool/openib/mpool_openib_module.c +++ b/ompi/mca/mpool/openib/mpool_openib_module.c @@ -182,9 +182,8 @@ void mca_mpool_openib_free(mca_mpool_base_module_t* mpool, void * addr, { if(registration){ mpool->mpool_deregister(mpool, registration); + free(registration->alloc_base); } - free(registration->alloc_base); - }