yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2021-02-10 20:36:21 -05:00
commit ce78b860be
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java
View file

@ -183,6 +183,9 @@ public class ElfDefaultGotPltMarkup {
monitor.checkCanceled(); monitor.checkCanceled();
Data data = createPointer(gotStart, true); Data data = createPointer(gotStart, true);
if (data == null) {
break;
}
try { try {
gotStart = data.getMaxAddress().add(1); gotStart = data.getMaxAddress().add(1);

2
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/plugin/prototype/MicrosoftCodeAnalyzerPlugin/RttiAnalyzer.java
View file

@ -58,7 +58,7 @@ public class RttiAnalyzer extends AbstractAnalyzer {
setSupportsOneTimeAnalysis(); setSupportsOneTimeAnalysis();
// Set priority of RTTI analyzer to run after Demangler so can see if better // Set priority of RTTI analyzer to run after Demangler so can see if better
// plate comment or label already exists from Demangler. // plate comment or label already exists from Demangler.
setPriority(AnalysisPriority.DATA_TYPE_PROPOGATION.before().before()); setPriority(AnalysisPriority.REFERENCE_ANALYSIS.before());
setDefaultEnablement(true); setDefaultEnablement(true);
validationOptions = new DataValidationOptions(); validationOptions = new DataValidationOptions();
applyOptions = new DataApplyOptions(); applyOptions = new DataApplyOptions();

6
Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java
View file

@ -218,8 +218,12 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
InetAddress localhost = InetAddress.getLocalHost(); InetAddress localhost = InetAddress.getLocalHost();
new Socket(localhost, PyDevUtils.PYDEV_REMOTE_DEBUGGER_PORT).close(); new Socket(localhost, PyDevUtils.PYDEV_REMOTE_DEBUGGER_PORT).close();
Msg.info(this, "Python debugger found"); Msg.info(this, "Python debugger found");
exec("import pydevd; pydevd.settrace(host=\"" + localhost.getHostName() + StringBuilder dbgCmds = new StringBuilder();
dbgCmds.append("import pydevd;");
dbgCmds.append("pydevd.threadingCurrentThread().__pydevd_main_thread = True;");
dbgCmds.append("pydevd.settrace(host=\"" + localhost.getHostName() +
"\", port=" + PyDevUtils.PYDEV_REMOTE_DEBUGGER_PORT + ", suspend=False);"); "\", port=" + PyDevUtils.PYDEV_REMOTE_DEBUGGER_PORT + ", suspend=False);");
exec(dbgCmds.toString());
Msg.info(this, "Connected to a python debugger."); Msg.info(this, "Connected to a python debugger.");
} }
catch (IOException e) { catch (IOException e) {