mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_d-millar_fix_for_ISF_test_failures'

Browse Source
This commit is contained in:
ghidra1
2023-12-01 18:02:23 -05:00
parent 1b813ed33e 15bcfc2594
commit 11a9b0baf7
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/AbstractIsfWriter.java
View File

@@ -44,7 +44,7 @@ public abstract class AbstractIsfWriter implements Closeable {
protected JsonArray objects = new JsonArray();
public AbstractIsfWriter(Writer baseWriter) throws IOException {
if (writer != null) {
if (baseWriter != null) {
this.writer = new JsonWriter(baseWriter);
writer.setIndent(" ");
}

9
Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfDataTypeWriter.java
View File

@@ -84,7 +84,6 @@ public class IsfDataTypeWriter extends AbstractIsfWriter {
private List<Address> requestedAddresses = new ArrayList<>();
private List<String> requestedSymbols = new ArrayList<>();
// private List<String> requestedTypes = new ArrayList<>();
private List<DataType> requestedDataTypes = new ArrayList<>();
private boolean skipSymbols = false;
private boolean skipTypes = false;
@@ -99,6 +98,7 @@ public class IsfDataTypeWriter extends AbstractIsfWriter {
*/
public IsfDataTypeWriter(DataTypeManager dtm, List<DataType> target, Writer baseWriter) throws IOException {
super(baseWriter);
this.baseWriter = baseWriter;
this.dtm = dtm;
if (dtm != null) {
dataOrganization = dtm.getDataOrganization();
@@ -113,10 +113,15 @@ public class IsfDataTypeWriter extends AbstractIsfWriter {
enums = new JsonObject();
functions = new JsonObject();
symbols = new JsonObject();
requestedDataTypes = target;
requestedDataTypes = target == null ? new ArrayList<>() : target;
STRICT = true;
}
public JsonObject getRootObject(TaskMonitor monitor) throws CancelledException, IOException {
genRoot(monitor);
return data;
}
@Override
protected void genRoot(TaskMonitor monitor) throws CancelledException, IOException {
genMetadata();

7
Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.java
View File

@@ -19,6 +19,8 @@ import java.io.IOException;
import java.io.Writer;
import java.util.List;
import com.google.gson.JsonObject;
import ghidra.program.model.data.Array;
import ghidra.program.model.data.BitFieldDataType;
import ghidra.program.model.data.BuiltInDataType;
@@ -50,6 +52,11 @@ public class ExtIsfDataTypeWriter extends IsfDataTypeWriter {
STRICT = false;
}
public JsonObject getRootObject(TaskMonitor monitor) throws CancelledException, IOException {
genRoot(monitor);
return root;
}
@Override
protected void genRoot(TaskMonitor monitor) throws CancelledException, IOException {
super.genRoot(monitor);