GP-5216 Corrected FunctionDefinitionDataType.setCallingConvention bug

ghidra1 · ghidra1 · commit 59ef3638802b · 2024-12-27T16:20:10.000-05:00
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FunctionDefinitionDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FunctionDefinitionDataType.java
@@ -189,7 +189,7 @@ public void setCallingConvention(String conventionName) throws InvalidInputExcep
 
 		if (GenericCallingConvention
 				.getGenericCallingConvention(conventionName) == GenericCallingConvention.unknown &&
-			!dataMgr.getKnownCallingConventionNames().contains(name)) {
+			(dataMgr == null || !dataMgr.getKnownCallingConventionNames().contains(name))) {
 			throw new InvalidInputException("Unknown calling convention name: " + conventionName);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void setCallingConvention(String conventionName) throws InvalidInputExcep`
`189`	`189`
`190`	`190`	`if (GenericCallingConvention`
`191`	`191`	`.getGenericCallingConvention(conventionName) == GenericCallingConvention.unknown &&`
`192`		`- !dataMgr.getKnownCallingConventionNames().contains(name)) {`
	`192`	`+ (dataMgr == null \|\| !dataMgr.getKnownCallingConventionNames().contains(name))) {`
`193`	`193`	`throw new InvalidInputException("Unknown calling convention name: " + conventionName);`
`194`	`194`	`}`
`195`	`195`