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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-10-16 16:43:06 -04:00
commit 54d05b70b3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/java/ghidra/app/util/SymbolInspector.java
View file

@ -111,7 +111,7 @@ public class SymbolInspector implements OptionsChangeListener {
}
/**
* Call this when you are done with this inspector and will not use it again.
* Call this when you are done with this inspector and will not use it again.
* Cleans up listeners, etc.
*/
public void dispose() {
@ -307,8 +307,8 @@ public class SymbolInspector implements OptionsChangeListener {
}
/**
* Gets the color and style used to render the given symbol. Calling this method is
* faster than calling {@link #getColor(Symbol)} and {@link #getStyle(Symbol)}
* Gets the color and style used to render the given symbol. Calling this method is
* faster than calling {@link #getColor(Symbol)} and {@link #getStyle(Symbol)}
* separately.
*
* @param s the symbol
@ -340,7 +340,7 @@ public class SymbolInspector implements OptionsChangeListener {
}
/**
* Get the ScreenElement corresponding to the type of the symbol
* Get the ScreenElement corresponding to the type of the symbol
* @param s symbol to inspect
* @return the screen element
*/
@ -432,7 +432,7 @@ public class SymbolInspector implements OptionsChangeListener {
private Color getColor(ScreenElement se) {
if (se == null) {
return Colors.BACKGROUND;
return Colors.FOREGROUND;
}
return se.getDefaultColor();
}

2
Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc
View file

@ -355,7 +355,7 @@ void ScopeLocal::checkUnaliasedReturn(const vector<uintb> &alias)
if (retOp == (PcodeOp *)0 || retOp->numInput() < 2) return;
Varnode *vn = retOp->getIn(1);
if (vn->getSpace() != space) return;
if (!vn->isMapped()) return;
// Assume vn is mapped. Cannot check vn->isMapped() as we are in the middle of restructuring.
vector<uintb>::const_iterator iter = lower_bound(alias.begin(),alias.end(),vn->getOffset());
if (iter != alias.end()) {
// Alias is greater than or equal to vn offset