github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 06:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-07-22 06:12:42 -04:00
parent 6077b55dd5 20643f0c31
commit a6a738f650
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/action/DebuggerTrackLocationTrait.java
View File

@@ -248,13 +248,19 @@ public class DebuggerTrackLocationTrait {
return action;
}
protected ActionState<LocationTrackingSpec> makeState(LocationTrackingSpec spec) {
return new ActionState<>(spec.getMenuName(), spec.getMenuIcon(), spec);
}
public List<ActionState<LocationTrackingSpec>> getStates() {
Map<String, ActionState<LocationTrackingSpec>> states = new TreeMap<>();
// NOTE: Ensure the saved spec is available, even if no factory produces it, yet.
// NOTE: In particular, the DebuggerWatchesPlugin may not read its config before us.
states.put(spec.getConfigName(), makeState(spec));
for (LocationTrackingSpec spec : LocationTrackingSpecFactory
.allSuggested(tool)
.values()) {
states.put(spec.getConfigName(),
new ActionState<>(spec.getMenuName(), spec.getMenuIcon(), spec));
states.put(spec.getConfigName(), makeState(spec));
}
ActionState<LocationTrackingSpec> current = action.getCurrentState();
if (current != null) {

3
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View File

@@ -1726,6 +1726,9 @@ Datatype *TypeStruct::nearestArrayedComponentForward(int8 off,int8 *newoff,int8
int8 suboff;
Datatype *res = subtype->nearestArrayedComponentForward(remain, &suboff, elSize);
if (res != (Datatype *)0) {
int8 subdiff = diff + remain - suboff;
if (subdiff > 128)
break;
*newoff = -diff;
return subtype;
}