yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

GP-3559 - Fixed NPE

Browse source
This commit is contained in:
dragonmacher 2023-06-20 13:18:26 -04:00
parent 9d7809902d
commit a4992e431a
2 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerComponent.java
View file

@ -96,6 +96,9 @@ public class ByteViewerComponent extends FieldPanel implements FieldMouseListene
} }
private String getFieldDescription(FieldLocation fieldLoc, Field field) { private String getFieldDescription(FieldLocation fieldLoc, Field field) {
if (field == null) {
return null;
}
ByteBlockInfo info = indexMap.getBlockInfo(fieldLoc.getIndex(), fieldLoc.getFieldNum()); ByteBlockInfo info = indexMap.getBlockInfo(fieldLoc.getIndex(), fieldLoc.getFieldNum());
if (info != null) { if (info != null) {
String modelName = model.getName(); String modelName = model.getName();

8
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java
View file

@ -1300,8 +1300,12 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
super(model, "Decompiler"); super(model, "Decompiler");
// In the decompiler each field represents a line, so make the field description // In the decompiler each field represents a line, so make the field description
// simply be the line number // simply be the line number
setFieldDescriptionProvider( setFieldDescriptionProvider((l, f) -> {
(l, f) -> "line " + (l.getIndex().intValue() + 1) + ", " + f.getText()); if (f == null) {
return null;
}
return "line " + (l.getIndex().intValue() + 1) + ", " + f.getText();
});
} }
/** /**