Fix potential mem leak seen by scan-build.

[simgrid.git] / src / smpi / mpi / smpi_errhandler.cpp

diff --git a/src/smpi/mpi/smpi_errhandler.cpp b/src/smpi/mpi/smpi_errhandler.cpp
index 6ed4b51..74e2242 100644 (file)
--- a/src/smpi/mpi/smpi_errhandler.cpp
+++ b/src/smpi/mpi/smpi_errhandler.cpp
@@ -8,10 +8,8 @@
 
 #include <cstdio>
 
-simgrid::smpi::Errhandler mpi_MPI_ERRORS_RETURN;
-MPI_Errhandler MPI_ERRORS_RETURN=&mpi_MPI_ERRORS_RETURN;
-simgrid::smpi::Errhandler mpi_MPI_ERRORS_ARE_FATAL;
-MPI_Errhandler MPI_ERRORS_ARE_FATAL=&mpi_MPI_ERRORS_ARE_FATAL;
+simgrid::smpi::Errhandler smpi_MPI_ERRORS_RETURN;
+simgrid::smpi::Errhandler smpi_MPI_ERRORS_ARE_FATAL;
 
 namespace simgrid{
 namespace smpi{
@@ -45,11 +43,15 @@ void Errhandler::ref()
 }
 
 void Errhandler::unref(Errhandler* errhandler){
+  if(errhandler == MPI_ERRORS_ARE_FATAL || errhandler == MPI_ERRORS_RETURN)
+    return;
   errhandler->refcount_--;
   if(errhandler->refcount_==0){
+    F2C::free_f(errhandler->f2c_id());
     delete errhandler;
   }
 }
 
 }
+
 }