Fixed remaining memory leaks! Now leak free!

Author: CodeByDrescher

IDAWin/SundialsSolverInterface.cpp

@@ -19,28 +19,72 @@
 void errExit(int returnCode, const std::string &errorMsg);
 
 void activateSolver(std::ifstream& inputFileStream, FILE* outputFile, int taskID) {
+	int returnCode = 0;
+	std::string errorMsg;
+	VCellSolver* targetSolver;
+	// First try block - create the solver; failure => no need to delete targetSolver!
 	try {
-		VCellSolver* targetSolver = VCellSolverFactory::produceVCellSolver(inputFileStream, taskID);
-		targetSolver->solve(nullptr, true, outputFile, VCellSundialsSolver::checkStopRequested);
+		targetSolver = VCellSolverFactory::produceVCellSolver(inputFileStream, taskID);
 	} catch (const char *ex) {
-		errExit(-1, ex);
+		returnCode = -1;
+		errorMsg = ex;
+		targetSolver = nullptr;
 	} catch (std::string &ex) {
-		errExit(-2, ex);
+		returnCode = -2;
+		errorMsg = ex;
+		targetSolver = nullptr;
 	} catch (StoppedByUserException&) {
-		errExit(0, "Execution Stopped By User");
+		returnCode = 0;
+		errorMsg = "Execution Stopped By User";
+		targetSolver = nullptr;
 	} catch (VCell::Exception &ex) {
-		errExit(-3, ex.getMessage());
+		returnCode = -3;
+		errorMsg = ex.getMessage();
+		targetSolver = nullptr;
 	} catch (const std::exception& err) {
-		errExit(-4, err.what());
+		returnCode = -4;
+		errorMsg = err.what();
+		targetSolver = nullptr;
 	} catch (...) {
-		errExit(-5, "unknown error");
+		returnCode = -5;
+		errorMsg = "Unknown Error Detected";
+		targetSolver = nullptr;
+	}
+	// second try block - solver is created; must delete it!
+	if (nullptr != targetSolver) {
+		try {
+			targetSolver->solve(nullptr, true, outputFile, VCellSundialsSolver::checkStopRequested);
+		} catch (const char *ex) {
+			returnCode = -1;
+			errorMsg = ex;
+			// errExit(-1, ex);
+		} catch (std::string &ex) {
+			returnCode = -2;
+			errorMsg = ex;
+		} catch (StoppedByUserException&) {
+			returnCode = 0;
+			errorMsg = "Execution Stopped By User";
+		} catch (VCell::Exception &ex) {
+			returnCode = -3;
+			errorMsg = ex.getMessage();
+		} catch (const std::exception& err) {
+			returnCode = -4;
+			errorMsg = err.what();
+		} catch (...) {
+			returnCode = -5;
+			errorMsg = "Unknown Error Detected";
+		}
+		// !!! DELETE THE SOLVER !!!
+		delete targetSolver;
 	}
 
 	// cleanup
 	if (SimulationMessaging::getInstVar() != nullptr) {
 		SimulationMessaging::getInstVar()->waitUntilFinished();
 		delete SimulationMessaging::getInstVar();
 	}
+
+	if (!errorMsg.empty()) errExit(returnCode, errorMsg);
 }
 
 void errExit(int returnCode, const std::string &errorMsg) {

IDAWin/VCellSolverFactory.cpp

@@ -43,7 +43,13 @@ VCellSolver* VCellSolverFactory::produceVCellSolver(std::ifstream& inputFileStre
 		default:
 			throw new VCell::Exception("Unknown VCellSolver type");
 	}
-	desiredSolver->configureFromInput(inputBreakdown);
+	try {
+		desiredSolver->configureFromInput(inputBreakdown);
+	} catch (...) {
+		delete desiredSolver;
+		throw;
+	}
+
 	return desiredSolver;
 }