Fix coverity varnings (hopefully). Refs #9939

mantidproject · Jul 16, 2014 · 1d227e1 · 1d227e1
1 parent 206267d
commit 1d227e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/API/src/IFunction.cpp b/Code/Mantid/Framework/API/src/IFunction.cpp
@@ -53,6 +53,7 @@ namespace API
     if (m_handler)
     {
       delete m_handler;
+      m_handler=NULL;
     }
   }
 

diff --git a/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp
@@ -58,6 +58,7 @@ namespace Mantid
     CalculateGammaBackground::~CalculateGammaBackground()
     {
       delete m_progress;
+      m_indices.clear();
     }
 
     //--------------------------------------------------------------------------------------------------------

diff --git a/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp b/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp
@@ -64,10 +64,12 @@ void IkedaCarpenterPV::setHeight(const double h)
 double IkedaCarpenterPV::height()const 
 {
   // return the function value at centre()
-  double h0;
-  double toCentre = centre();
-  constFunction(&h0, &toCentre, 1);
-  return h0;
+  //using arrays - otherwise coverity warning
+  double h0[1];
+  double toCentre[1];
+  toCentre[0]= centre();
+  constFunction(h0, toCentre, 1);
+  return h0[0];
 };
 
 double IkedaCarpenterPV::fwhm()const