Merge pull request #28 from lxylxy123456/huffman

Fix memory leak in src/Huffman{Main,Test}.cpp

Makefile

@@ -34,7 +34,6 @@ VALGRIND := $(filter-out valgrind/RaceExampleTest,$(VALGRIND))
 # VALGRIND_ALL has currently unavailable tests filtered out
 VALGRIND_ALL := $(VALGRIND)
 VALGRIND_ALL := $(filter-out valgrind/FibTest,$(VALGRIND_ALL))
-VALGRIND_ALL := $(filter-out valgrind/HuffmanTest,$(VALGRIND_ALL))
 VALGRIND_ALL := $(filter-out valgrind/IntervalTreeTest,$(VALGRIND_ALL))
 VALGRIND_ALL := $(filter-out valgrind/MatVecTest,$(VALGRIND_ALL))
 VALGRIND_ALL := $(filter-out valgrind/PSquareMatrixMultiplyTest,$(VALGRIND_ALL))

include/Huffman.hpp

@@ -34,6 +34,13 @@ class CNode {
 		CNode(T d, size_t f): disp(d), freq(f), left(nullptr), right(nullptr) {}
 		CNode(T d, size_t f, CNode<T>* l, CNode<T>* r): disp(d), freq(f),
 														left(l), right(r) {}
+		CNode<T>* recursive_destruct() {
+			if (left)
+				delete left->recursive_destruct();
+			if (right)
+				delete right->recursive_destruct();
+			return this;
+		}
 		friend std::ostream& operator<<(std::ostream& o, const CNode<T>& r) {
 			return o << r.disp;
 		}

src/HuffmanMain.cpp

@@ -64,5 +64,6 @@ int main(int argc, char *argv[]) {
 	// call function
 	CNode<char>* B = Huffman(C);
 	TreePrint(B, HuffmanNavigator<CNode<char>*>());
+	delete B->recursive_destruct();
 	return 0;
 }

src/HuffmanTest.cpp

@@ -63,6 +63,7 @@ int test(size_t n) {
 	// call function
 	CNode<char>* B = Huffman(C);
 	TreePrint(B, HuffmanNavigator<CNode<char>*>());
+	delete B->recursive_destruct();
 	return 0;
 }