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

Merge remote-tracking branch

Browse source 
'origin/GP-5252_James_BSimFeatureVisualizer_NPE' into Ghidra_11.3
(Closes #7311)
This commit is contained in:
Ryan Kurtz 2025-01-14 13:25:48 -05:00
commit 2d10fa1be2
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ghidra/Features/BSimFeatureVisualizer/src/main/java/ghidra/bsfv/BsfvTokenHighlightMatcher.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -118,7 +118,10 @@ class BsfvTokenHighlightMatcher implements CTokenHighlightMatcher {
List<ClangToken> opTokens = List<ClangToken> opTokens =
DecompilerUtils.getTokens(root, pcodeOp.getSeqnum().getTarget()); DecompilerUtils.getTokens(root, pcodeOp.getSeqnum().getTarget());
for (ClangToken token : opTokens) { for (ClangToken token : opTokens) {
lineHighlights.add(token.getLineParent().getLineNumber()); ClangLine line = token.getLineParent();
if (line != null) {
lineHighlights.add(line.getLineNumber());
}
} }
} }
@ -126,7 +129,10 @@ class BsfvTokenHighlightMatcher implements CTokenHighlightMatcher {
List<ClangToken> secondaryOpTokens = List<ClangToken> secondaryOpTokens =
DecompilerUtils.getTokens(root, previousPcodeOp.getSeqnum().getTarget()); DecompilerUtils.getTokens(root, previousPcodeOp.getSeqnum().getTarget());
for (ClangToken token : secondaryOpTokens) { for (ClangToken token : secondaryOpTokens) {
secondaryLineHighlights.add(token.getLineParent().getLineNumber()); ClangLine line = token.getLineParent();
if (line != null) {
secondaryLineHighlights.add(line.getLineNumber());
}
} }
} }
@ -191,14 +197,15 @@ class BsfvTokenHighlightMatcher implements CTokenHighlightMatcher {
} }
} }
} }
if (token.getLineParent() != null) { ClangLine line = token.getLineParent();
if (lineHighlights.contains(token.getLineParent().getLineNumber())) { if (line != null) {
if (lineHighlights.contains(line.getLineNumber())) {
return LINE_HIGHLIGHT_COLOR; return LINE_HIGHLIGHT_COLOR;
} }
if (secondaryLineHighlights.contains(token.getLineParent().getLineNumber())) { if (secondaryLineHighlights.contains(line.getLineNumber())) {
return SECONDARY_LINE_HIGHLIGHT_COLOR; return SECONDARY_LINE_HIGHLIGHT_COLOR;
} }
if (blockHighlights.contains(token.getLineParent().getLineNumber())) { if (blockHighlights.contains(line.getLineNumber())) {
return options.getColor(BSimFeatureGraphType.BASE_BLOCK_VERTEX, DEFAULT_HIGHLIGHT); return options.getColor(BSimFeatureGraphType.BASE_BLOCK_VERTEX, DEFAULT_HIGHLIGHT);
} }
} }