Re #7876. Fix potential memory leak.

Don't leak memory if one of the 3 allocations failed.
mantidproject · Sep 4, 2013 · 4953b37 · 4953b37
1 parent 14fedf7
commit 4953b37
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Code/Mantid/MantidPlot/src/FFT.cpp b/Code/Mantid/MantidPlot/src/FFT.cpp
@@ -184,11 +184,15 @@ QString FFT::fftTable()
 	gsl_fft_complex_wavetable *wavetable = gsl_fft_complex_wavetable_alloc (d_n);
 	gsl_fft_complex_workspace *workspace = gsl_fft_complex_workspace_alloc (d_n);
 
-	if(!amp || !wavetable || !workspace){
-		QMessageBox::critical(dynamic_cast<ApplicationWindow *>(parent()), tr("MantidPlot") + " - " + tr("Error"),
-                        tr("Could not allocate memory, operation aborted!"));
-        d_init_err = true;
-        return "";
+	if(!amp || !wavetable || !workspace)
+	{
+	  QMessageBox::critical(dynamic_cast<ApplicationWindow *>(parent()), tr("MantidPlot") + " - " + tr("Error"),
+				tr("Could not allocate memory, operation aborted!"));
+	  delete[] amp;
+	  if (wavetable) gsl_fft_complex_wavetable_free (wavetable);
+	  if (workspace) gsl_fft_complex_workspace_free (workspace);
+	  d_init_err = true;
+	  return "";
 	}
 
 	double df = 1.0/(double)(d_n*d_sampling);//frequency sampling