Merge remote-tracking branch 'origin/patch'

ryanmkurtz · ryanmkurtz · commit 2eff37f65515 · 2025-02-14T12:12:52.000-05:00
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
@@ -3581,7 +3581,7 @@ public Symbol createSymbol(Address addr, String name, boolean isPrimary, boolean
 		SymbolTable symbolTable = program.getSymbolTable();
 		Symbol sym = symbolTable.createLabel(addr, name, namespace, SourceType.IMPORTED);
 		if (isPrimary) {
-			checkPrimary(sym);
+			sym = checkPrimary(sym);
 		}
 		if (pinAbsolute && !sym.isPinned()) {
 			sym.setPinned(true);

Original file line number	Diff line number	Diff line change
`@@ -3581,7 +3581,7 @@ public Symbol createSymbol(Address addr, String name, boolean isPrimary, boolean`
`3581`	`3581`	`SymbolTable symbolTable = program.getSymbolTable();`
`3582`	`3582`	`Symbol sym = symbolTable.createLabel(addr, name, namespace, SourceType.IMPORTED);`
`3583`	`3583`	`if (isPrimary) {`
`3584`		`- checkPrimary(sym);`
	`3584`	`+ sym = checkPrimary(sym);`
`3585`	`3585`	`}`
`3586`	`3586`	`if (pinAbsolute && !sym.isPinned()) {`
`3587`	`3587`	`sym.setPinned(true);`