Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6969 - Fixed NPE double-clicking on an offcut label

dragonmacherbd1d97408d6c
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
index 98d9c2f9f8..15df2eb314 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/LabelFieldMouseHandler.java
@@ -76,8 +76,11 @@ public class LabelFieldMouseHandler implements FieldMouseHandlerExtension {
Address addr = location.getAddress();
Program program = location.getProgram();
Listing listing = program.getListing();
- CodeUnit cu = listing.getCodeUnitAt(addr);
- service.showSymbols(cu);
+ CodeUnit cu = listing.getCodeUnitContaining(addr);
+ if (cu != null) {
+ service.showSymbols(cu);
+ return;
+ }
}
private String getText(Object clickedObject) {