Fix memory leak caused by wrong memory management of CSignal static m…

…ember variables.
shogun-toolbox · Jul 11, 2017 · 6f1603a · 6f1603a
1 parent 8ac2b02
commit 6f1603a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/shogun/base/init.cpp b/src/shogun/base/init.cpp
@@ -35,6 +35,8 @@ shogun::CMap<void*, shogun::MemoryBlock>* sg_mallocs=NULL;
 #include <google/protobuf/stubs/common.h>
 #endif
 
+#include <rxcpp/rx-lite.hpp>
+
 namespace shogun
 {
 	Parallel* sg_parallel=NULL;
@@ -122,6 +124,10 @@ namespace shogun
 		SG_UNREF(sg_parallel);
 		SG_UNREF(sg_io);
 
+		delete CSignal::m_subscriber;
+		delete CSignal::m_observable;
+		delete CSignal::m_subject;
+
 #ifdef HAVE_PROTOBUF
 		::google::protobuf::ShutdownProtobufLibrary();
 #endif

diff --git a/src/shogun/lib/Signal.h b/src/shogun/lib/Signal.h
@@ -90,7 +90,7 @@ namespace shogun
 	private:
 		/** Active signal */
 		static bool m_active;
-
+	public:
 		/** Observable */
 		static SGSubjectS * m_subject;
 		static SGObservableS * m_observable;