development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-25 03:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ryan Kurtz 2024-03-13 06:58:25 -04:00
parent f1bcb3151f 4fa8c5070f
commit e07abfee21
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Sarif/src/main/java/sarif/SarifLoader.java
View file

@ -311,7 +311,7 @@ public class SarifLoader extends AbstractProgramLoader {
}
}
private ParseResult parse(ByteProvider provider) {
private ParseResult parse(ByteProvider provider) throws IOException {
try {
ProgramSarifMgr lastSarifMgr = new ProgramSarifMgr(provider);
ProgramInfo lastInfo = lastSarifMgr.getProgramInfo();
@ -321,8 +321,9 @@ public class SarifLoader extends AbstractProgramLoader {
// This can happen during the import process when this loader attempts to load
// a non-SARIF file (there really should be 2 methods, a speculative version and
// a version that expects no exception)
Msg.trace(this, "Unable to parse SARIF for " + provider.getName(), e);
return new ParseResult(null, null);
// This will get caught and discarded by the opinion logic
throw new IOException("Unable to parse "+provider.getName()+"as SARIF");
}
}