Fixed dozens of memory leaks

2 files changed, 22 insertions, 17 deletions

diff --git a/src/uscxml/plugins/ioprocessor/CMakeLists.txt b/src/uscxml/plugins/ioprocessor/CMakeLists.txt
index 1171d73..3505920 100644
--- a/src/uscxml/plugins/ioprocessor/CMakeLists.txt
+++ b/src/uscxml/plugins/ioprocessor/CMakeLists.txt
@@ -1,20 +1,25 @@
 # scxml ioprocessor
 
-set(USCXML_IOPROCESSORS "scxml ${USCXML_IOPROCESSORS}")
-file(GLOB_RECURSE SCXML_IOPROCESSOR
-	scxml/*.cpp
-	scxml/*.h
-)
-list (APPEND USCXML_FILES ${SCXML_IOPROCESSOR})
+OPTION(WITH_IOPROC_SCXML "Build the scxml i/o processor" ON)
+if (WITH_IOPROC_SCXML)
+	set(USCXML_IOPROCESSORS "scxml ${USCXML_IOPROCESSORS}")
+	file(GLOB_RECURSE SCXML_IOPROCESSOR
+		scxml/*.cpp
+		scxml/*.h
+	)
+	list (APPEND USCXML_FILES ${SCXML_IOPROCESSOR})
+endif()
 
-set(USCXML_IOPROCESSORS "basichttp ${USCXML_IOPROCESSORS}")
-file(GLOB_RECURSE BASICHTTP_IOPROCESSOR
-	basichttp/*.cpp
-	basichttp/*.h
-)
-list (APPEND BASICHTTP_IOPROCESSOR "")
-
-list (APPEND USCXML_FILES ${BASICHTTP_IOPROCESSOR})
+OPTION(WITH_IOPROC_BASICHTTP "Build the basichttp i/o processor" ON)
+if (WITH_IOPROC_BASICHTTP)
+	set(USCXML_IOPROCESSORS "basichttp ${USCXML_IOPROCESSORS}")
+	file(GLOB_RECURSE BASICHTTP_IOPROCESSOR
+		basichttp/*.cpp
+		basichttp/*.h
+	)
+	list (APPEND BASICHTTP_IOPROCESSOR "")
+	list (APPEND USCXML_FILES ${BASICHTTP_IOPROCESSOR})
+endif()
 
 set(USCXML_INCLUDE_DIRS ${USCXML_INCLUDE_DIRS} PARENT_SCOPE)
 set(USCXML_OPT_LIBS ${USCXML_OPT_LIBS} PARENT_SCOPE)
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
index f81cf54..317b94c 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
@@ -199,9 +199,9 @@ void BasicHTTPIOProcessor::eventFromSCXML(const std::string& target, const Event
 		char* eventValueCStr = evhttp_encode_uri(event.name.c_str());
 		kvps << kvpSeperator << eventNameCStr << "=" << eventValueCStr;
 		kvpSeperator = "&";
-		free(eventNameCStr);
-		free(eventValueCStr);
-		targetURL.addOutHeader("_scxmleventname", evhttp_encode_uri(event.name.c_str()));
+		targetURL.addOutHeader("_scxmleventname", eventValueCStr);
+        free(eventNameCStr);
+        free(eventValueCStr);
 	}
 
 	// event namelist