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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-08-10 09:28:41 -04:00
commit ccebb721db
10 changed files with 98 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/cmd/DbgLaunchProcessCommand.java
View file

@ -89,7 +89,9 @@ public class DbgLaunchProcessCommand extends AbstractDbgCommand<DbgThread> {
initialDirectory = fixPath(initialDirectory);
environment = fixPath(environment);
// NB: The intent here is to enable multi-line input via a single dialog field
environment = environment.replace("\\0", "\0");
if (environment != null) {
environment = environment.replace("\\0", "\0");
}
dbgeng.createProcess(dbgeng.getLocalServer(), StringUtils.join(newArgs, " "),
initialDirectory, environment, createFlags, engCreateFlags, verifierFlags);

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesPanel.java
View file

@ -92,6 +92,9 @@ public class DebuggerModulesPanel extends AbstractObjectsTableBasedPanel<TraceOb
@Override
public String getValue(ValueRow rowObject, Settings settings, Trace data,
ServiceProvider serviceProvider) throws IllegalArgumentException {
if (data == null) {
return "";
}
ValueAttribute<AddressRange> attr =
rowObject.getAttribute(TargetModule.RANGE_ATTRIBUTE_NAME, AddressRange.class);
if (attr == null) {

6
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataTypeManager.java
View file

@ -19,8 +19,8 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.concurrent.locks.ReadWriteLock;
import db.Transaction;
import db.DBHandle;
import db.Transaction;
import ghidra.framework.model.DomainFile;
import ghidra.program.database.data.ProgramBasedDataTypeManagerDB;
import ghidra.program.model.address.Address;
@ -70,6 +70,10 @@ public class DBTraceDataTypeManager extends ProgramBasedDataTypeManagerDB
return trace.getBaseAddressFactory();
}
}, null, false, monitor);
if (openMode == DBOpenMode.CREATE) {
saveDataOrganization();
}
}
@Override