Ghidra is a software reverse engineering (SRE) framework
GP-6448 - Fix for label names that have namespace delimiters
dragonmacheref39bfe1d80b
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.javaindex dd648b93d3..840432fc67 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java@@ -54,12 +54,16 @@ public class LabelFieldLocation extends CodeUnitLocation {Namespace namespace, int row, int charOffset) {super(program, addr, componentPath, row, 0, charOffset);- if (namespace == null || namespace.isGlobal()) {- symbolPath = new SymbolPath(label);- }- else {- symbolPath = new SymbolPath(new SymbolPath(namespace.getSymbol()), label);+ SymbolPath nsPath = null;+ if (namespace != null && !namespace.isGlobal()) {+ nsPath = new SymbolPath(namespace.getSymbol());}++ // Note: use the constructor that does not parse the name. Assume all label field+ // locations are for existing symbol names or those that otherwise should not need to be+ // parsed. Parsing for existing symbols may incorrectly split on namespace delimiters that+ // are part of the symbol name.+ symbolPath = new SymbolPath(nsPath, label);}/**