Merge pull request #23 from chaoticgd/symboltablefix5

Silence the error that gets thrown when a function name is already applied

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+# v2.1.4
+
+- stabs: Silence the error that gets thrown when a function name is already applied.
+
+# v2.1.3
+
+- stabs: Fixed an issue where Ghidra would mix up types in some cases for structures defined inline inside unions.
+- stabs: Remove junk labels such as `gcc2_compiled.` during analysis so that Ghidra doesn't confuse them for the real function names.
+
 ## v2.1.2
 
 - Improved type deduplication algorithm (stdump v1.1 is included).

src/main/java/ghidra/emotionengine/symboltable/StabsImporter.java

@@ -284,7 +284,7 @@ public void importFunctions(StdumpAST.ImporterState importer, Program program) {
 					Address high = toAddr(def.addressRange.high - 1);
 					AddressSet range = new AddressSet(low, high);
 					Function function = findOrCreateFunction(def, low, high, range);
-					setFunctionName(function, def, sourceFile, low, program);
+					setFunctionName(function, def);
 					function.setComment(sourceFile.path);
 					if(type.returnType != null) {
 						try {
@@ -344,13 +344,12 @@ private Function findOrCreateFunction(StdumpAST.FunctionDefinition def, Address
 		return function;
 	}
 
-	private void setFunctionName(Function function, StdumpAST.FunctionDefinition def,
-			StdumpAST.SourceFile sourceFile, Address low, Program program) {
+	private void setFunctionName(Function function, StdumpAST.FunctionDefinition def) {
 		try {
 			function.setName(def.name, SourceType.ANALYSIS);
-		} catch (DuplicateNameException | InvalidInputException e) {
+		} catch (InvalidInputException e) {
 			log.appendException(e);
-		}
+		} catch (DuplicateNameException e) {}
 	}
 
 	private HashSet<String> fillInParameters(Function function, StdumpAST.ImporterState importer,