Fixed memory leak in HtmlDocument (free doc)

Fix crash when internal transforms and debug document are enabled together (remove debug target transform from presenter)

1 files changed, 9 insertions, 7 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index ea50627..566b979 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -138,26 +138,28 @@ CgiApplicationEngine::process() const
 	}
 	if (TransformSourcePtr ts = currentStage.get<2>()) {
 		TransformSourcePtr final = finalTransformSource(ts);
-		ScopeObject emptyFinal(boost::bind(&TransformSource::clearTargets, final));
+		ScopeObject emptyFinal([final] { final->clearTargets(); });
 		final->addTarget(new CgiResult(header, IO,
 					rs && rs->root ? rs->root->value("encoding", _env->outputEncoding) : VariableType(_env->outputEncoding)), NULL);
 		BOOST_FOREACH(const PresenterCachePtr & p, rs->caches) {
 			final->addTarget(p, NULL);
 		}
-		std::fstream * ddd = NULL;
+		boost::shared_ptr<std::fstream> ddd;
+		ostreamWrapper * osw = NULL;
+		ScopeObject removeDdd([ts, &osw] { if (osw) { ts->removeTarget(osw); } });
 		if (!_env->dumpdatadoc.empty()) {
-			ddd = new std::fstream(_env->dumpdatadoc.c_str(), std::fstream::trunc | std::fstream::out);
+			ddd = boost::shared_ptr<std::fstream>(new std::fstream(_env->dumpdatadoc.c_str(), std::fstream::trunc | std::fstream::out));
 			if (ddd->good()) {
-				ts->addTarget(new ostreamWrapper(*ddd));
+				ts->addTarget(osw = new ostreamWrapper(*ddd));
+			}
+			else {
+				ddd.reset();
 			}
 		}
 		ts->doTransforms();
 		BOOST_FOREACH(const PresenterCachePtr & p, rs->caches) {
 			p->flushCache();
 		}
-		if (ddd) {
-			delete ddd;
-		}
 	}
 	else {
 		header->render(IO);