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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2021-03-26 16:13:32 -04:00
commit cce6807470
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/plugin/prototype/MicrosoftCodeAnalyzerPlugin/WindowsResourceReferenceAnalyzer.java
View file

@ -69,8 +69,7 @@ public class WindowsResourceReferenceAnalyzer extends AbstractAnalyzer {
@Override @Override
public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log)
throws CancelledException { throws CancelledException {
runScript(program, set, "WindowsResourceReference.java", monitor); return runScript(program, set, "WindowsResourceReference.java", monitor);
return true;
} }
public boolean runScript(Program program, AddressSetView set, String scriptName, public boolean runScript(Program program, AddressSetView set, String scriptName,
@ -115,7 +114,7 @@ public class WindowsResourceReferenceAnalyzer extends AbstractAnalyzer {
Msg.warn(this, "Unable to locate script class: " + e.getMessage(), e); Msg.warn(this, "Unable to locate script class: " + e.getMessage(), e);
} }
catch (CancelledException e) { catch (CancelledException e) {
Msg.warn(this, "User cancelled script.", e); // ignore
} }
catch (Exception e) { catch (Exception e) {
Msg.warn("Error running script: " + scriptName + "\n" + e.getMessage(), e); Msg.warn("Error running script: " + scriptName + "\n" + e.getMessage(), e);