Merge remote-tracking branch 'origin/caheckman_MapState_fix'

GhidorahRex · GhidorahRex · commit 2ad6dd6f545d · 2020-01-14T14:21:16.000-05:00
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc
@@ -835,6 +835,8 @@ void MapState::reconcileDatatypes(void)
 	startDatatype = curDatatype;
       if (curHint->compare(*newList.back()) != 0)
 	newList.push_back(curHint);		// Keep the current hint if it is otherwise different
+      else
+	delete curHint;		// RangeHint is on the heap, so delete if we are not keeping it
     }
     else {
       while(startPos < newList.size()) {

Original file line number	Diff line number	Diff line change
`@@ -835,6 +835,8 @@ void MapState::reconcileDatatypes(void)`
`835`	`835`	`startDatatype = curDatatype;`
`836`	`836`	`if (curHint->compare(*newList.back()) != 0)`
`837`	`837`	`newList.push_back(curHint); // Keep the current hint if it is otherwise different`
	`838`	`+ else`
	`839`	`+ delete curHint; // RangeHint is on the heap, so delete if we are not keeping it`
`838`	`840`	`}`
`839`	`841`	`else {`
`840`	`842`	`while(startPos < newList.size()) {`