Merge pull request #1161 from tklein23/develop

CKernel: Fixed uninitialized "lhs_equals_rhs", fixed memory leak in CustomKernel test.
shogun-toolbox · Jun 7, 2013 · 87a3fce · 87a3fce
2 parents 818a18b + 4055e99
commit 87a3fce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/shogun/kernel/Kernel.cpp b/src/shogun/kernel/Kernel.cpp
@@ -964,6 +964,7 @@ void CKernel::init()
 	rhs=NULL;
 	num_lhs=0;
 	num_rhs=0;
+	lhs_equals_rhs=false;
 	combined_kernel_weight=1;
 	optimization_initialized=false;
 	opt_type=FASTBUTMEMHUNGRY;

diff --git a/tests/unit/kernel/CustomKernel_unittest.cc b/tests/unit/kernel/CustomKernel_unittest.cc
@@ -101,6 +101,7 @@ TEST(CustomKernelTest,add_row_subset_constructor)
 			EXPECT_EQ(main_subset_matrix(i, j), main_subset_copy_matrix(i, j));
 	}
 
+	SG_UNREF(main_subset_copy);
 	SG_UNREF(gaussian);
 	SG_UNREF(main_kernel);
 	SG_UNREF(copy);