yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-757 - Function Graph - fixed bug that colored the entire vertex when

Browse source 
only the entry point had a color applied

Closes #1080
This commit is contained in:
dragonmacher 2021-03-08 12:32:19 -05:00
parent c905c203f0
commit e619d8ab72
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/ToolBasedColorProvider.java
View file

@ -22,6 +22,7 @@ import ghidra.app.plugin.core.colorizer.ColorizingService;
import ghidra.app.plugin.core.functiongraph.graph.vertex.FGVertex;
import ghidra.app.plugin.core.functiongraph.mvc.FunctionGraphVertexAttributes;
import ghidra.framework.options.SaveState;
import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.listing.Program;
class ToolBasedColorProvider implements FGColorProvider {
@ -102,6 +103,15 @@ class ToolBasedColorProvider implements FGColorProvider {
// The loading/saving of colors is handled automatically by the service, but this is
// for the background of the code units stored in the DB. We still have to let this
// vertex know that it has a custom background.
AddressSetView addresses = vertex.getAddresses();
AddressSetView allColorAddress = service.getAllBackgroundColorAddresses();
if (!allColorAddress.contains(addresses)) {
// sparse colors for the addresses of this node; assume this has not been colored
// from the function graph, but from the service for individual addresses.
return;
}
Color savedColor = service.getBackgroundColor(vertex.getVertexAddress());
if (savedColor != null) {
vertex.restoreColor(savedColor);