Every single file in this commit had a memory leak where a resource is

allocated in the constructor but not de-allocated in the destructor.

This commit fixes that.

1 files changed, 2 insertions, 1 deletions

diff --git a/inputmethods/dasher/PPMLanguageModel.cpp b/inputmethods/dasher/PPMLanguageModel.cpp
index 137b07f..d767d16 100644
--- a/inputmethods/dasher/PPMLanguageModel.cpp
+++ b/inputmethods/dasher/PPMLanguageModel.cpp
@@ -14,105 +14,106 @@ using namespace std;
 
 // static TCHAR debug[256];
 typedef unsigned long ulong;
 
 ////////////////////////////////////////////////////////////////////////
 /// PPMnode definitions 
 ////////////////////////////////////////////////////////////////////////
 
 CPPMLanguageModel::CPPMnode *CPPMLanguageModel::CPPMnode::find_symbol(int sym)
 // see if symbol is a child of node
 {
 	//  printf("finding symbol %d at node %d\n",sym,node->id);
 	CPPMnode *found=child;
 	while (found) {
 		if (found->symbol==sym)
 			return found;
 		found=found->next;
 	}
 	return 0;
 }
 
 
 CPPMLanguageModel::CPPMnode * CPPMLanguageModel::CPPMnode::add_symbol_to_node(int sym,int *update)
 {
 	CPPMnode *born,*search;
 	search=find_symbol(sym);
 	if (!search) {
 		born = new CPPMnode(sym);
 		born->next=child;
 		child=born;
 		//   node->count=1;
 		return born;		
 	} else {
 		if (*update) {   // perform update exclusions
 			search->count++;
 			*update=0;
 		}
 		return search;
 	}
 	
 }
 
 
 /////////////////////////////////////////////////////////////////////
 // CPPMLanguageModel defs
 /////////////////////////////////////////////////////////////////////
 
 CPPMLanguageModel::CPPMLanguageModel(CAlphabet *_alphabet,int _normalization)
-	: CLanguageModel(_alphabet,_normalization)
+	: CLanguageModel(_alphabet,_normalization), root(0), m_rootcontext(0)
 {
 	root=new CPPMnode(-1);
 	m_rootcontext=new CPPMContext(root,0);
 }
 
 
 CPPMLanguageModel::~CPPMLanguageModel()
 {
+	delete m_rootcontext;
 	delete root;
 }
 
 
 bool CPPMLanguageModel::GetProbs(CContext *context,vector<unsigned int> &probs,double )
 	// get the probability distribution at the context
 {
 	// seems like we have to have this hack for VC++
 	CPPMContext *ppmcontext=static_cast<CPPMContext *> (context);
 	
 	
 	int modelchars=GetNumberModelChars();
 	int norm=CLanguageModel::normalization();
 	probs.resize(modelchars);
 	CPPMnode *temp,*s; 
 	int loop,total;
 	int sym; 
 	// ulong spent=0; 
 	ulong size_of_slice;
 	bool *exclusions=new bool [modelchars];
 	ulong uniform=modelchars;
 	ulong tospend=norm-uniform;
 	temp=ppmcontext->head;
 	for (loop=0; loop <modelchars; loop++) {   /* set up the exclusions array */
 		probs[loop]=0;
 		exclusions[loop]=0;
 	}
 	while (temp!=0) {
 		//	Usprintf(debug,TEXT("tospend %u\n"),tospend);
 		//	DebugOutput(TEXT("round\n"));
 		total=0;
 		s=temp->child;
 		while (s) {
 			sym=s->symbol; 
 			if (!exclusions[s->symbol])
 				total=total+s->count;
 			s=s->next;
 		}
 		if (total) {
 			//	Usprintf(debug,TEXT"escape %u\n"),tospend*
 			size_of_slice=tospend;
 			s=temp->child;
 			while (s) {
 				if (!exclusions[s->symbol]) {
 					exclusions[s->symbol]=1;
 					ulong p=size_of_slice*(2*s->count-1)/2/ulong(total);
 					probs[s->symbol]+=p;
 					tospend-=p;