yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-5822 Corrected errors related to null CommentType returned by

Browse source 
CommentFieldLocation
This commit is contained in:
ghidra1 2025-07-11 09:04:34 -04:00
parent 3ad921d5c7
commit 183ecf3acf
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java
View file

@ -758,9 +758,11 @@ public class CodeBrowserClipboardProvider extends ByteCopier
CommentFieldLocation commentFieldLocation = (CommentFieldLocation) currentLocation; CommentFieldLocation commentFieldLocation = (CommentFieldLocation) currentLocation;
Address address = commentFieldLocation.getAddress(); Address address = commentFieldLocation.getAddress();
CommentType commentType = commentFieldLocation.getCommentType(); CommentType commentType = commentFieldLocation.getCommentType();
if (commentType != null) {
SetCommentCmd cmd = new SetCommentCmd(address, commentType, string); SetCommentCmd cmd = new SetCommentCmd(address, commentType, string);
return tool.execute(cmd, currentProgram); return tool.execute(cmd, currentProgram);
} }
}
return false; return false;
} }

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/comments/CommentsPlugin.java
View file

@ -255,6 +255,9 @@ public class CommentsPlugin extends Plugin implements OptionsChangeListener {
CommentFieldLocation cfLoc = (CommentFieldLocation) loc; CommentFieldLocation cfLoc = (CommentFieldLocation) loc;
CommentType type = cfLoc.getCommentType(); CommentType type = cfLoc.getCommentType();
if (type == null) {
return;
}
switch (type) { switch (type) {
case PRE: case PRE:
action.getPopupMenuData() action.getPopupMenuData()

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/CommentTypeUtils.java
View file

@ -26,13 +26,17 @@ public class CommentTypeUtils {
* @param cu * @param cu
* @param loc * @param loc
* @param defaultCommentType * @param defaultCommentType
* @return comment type * @return comment type or defaultCommentType if location does not correspond
* to a comment
*/ */
public static CommentType getCommentType(CodeUnit cu, ProgramLocation loc, public static CommentType getCommentType(CodeUnit cu, ProgramLocation loc,
CommentType defaultCommentType) { CommentType defaultCommentType) {
if (loc instanceof CommentFieldLocation) { if (loc instanceof CommentFieldLocation) {
CommentFieldLocation cfLoc = (CommentFieldLocation) loc; CommentFieldLocation cfLoc = (CommentFieldLocation) loc;
return cfLoc.getCommentType(); CommentType type = cfLoc.getCommentType();
if (type != null) {
return type;
}
} }
else if (loc instanceof PlateFieldLocation) { else if (loc instanceof PlateFieldLocation) {
return CommentType.PLATE; return CommentType.PLATE;