Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1284_TestFrameworkFixes'

Browse Source
This commit is contained in:
Ryan Kurtz 2021-09-10 13:40:09 -04:00
commit af2d461d85
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Decompiler/src/decompile/cpp/Makefile
View File

@ -123,7 +123,7 @@ TEST_NAMES=$(CORE) $(DECCORE) $(SLEIGH) $(EXTRA) test
TEST_DEBUG=-D__TERMINAL__ TEST_DEBUG=-D__TERMINAL__
GHIDRA_NAMES=$(CORE) $(DECCORE) $(GHIDRA) GHIDRA_NAMES=$(CORE) $(DECCORE) $(GHIDRA)
GHIDRA_NAMES_DBG=$(GHIDRA_NAMES) callgraph ifacedecomp ifaceterm interface GHIDRA_NAMES_DBG=$(GHIDRA_NAMES) callgraph ifacedecomp testfunction ifaceterm interface
GHIDRA_DEBUG=-DCPUI_DEBUG GHIDRA_DEBUG=-DCPUI_DEBUG
GHIDRA_OPT= GHIDRA_OPT=

1
Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
View File

@ -286,7 +286,6 @@ void Architecture::clearAnalysis(Funcdata *fd)
fd->clear(); // Clear stuff internal to function fd->clear(); // Clear stuff internal to function
// Clear out any analysis generated comments // Clear out any analysis generated comments
commentdb->clearType(fd->getAddress(),Comment::warning|Comment::warningheader); commentdb->clearType(fd->getAddress(),Comment::warning|Comment::warningheader);
stringManager->clear();
} }
/// Symbols do not necessarily need to be available for the decompiler. /// Symbols do not necessarily need to be available for the decompiler.

5
Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.cc
View File

@ -51,6 +51,11 @@ IfaceTerm::IfaceTerm(const string &prmpt,istream &is,ostream &os)
IfaceTerm::~IfaceTerm(void) IfaceTerm::~IfaceTerm(void)
{ {
while(!inputstack.empty()) {
delete sptr;
sptr = inputstack.back();
inputstack.pop_back();
}
#ifdef __TERMINAL__ #ifdef __TERMINAL__
if (is_terminal) { if (is_terminal) {
tcsetattr(ifd,TCSANOW,&itty); // Restore original terminal settings tcsetattr(ifd,TCSANOW,&itty); // Restore original terminal settings

1
Ghidra/Features/Decompiler/src/decompile/cpp/interface.cc
View File

@ -145,6 +145,7 @@ void IfaceStatus::pushScript(const string &filename,const string &newprompt)
ifstream *s = new ifstream(filename.c_str()); ifstream *s = new ifstream(filename.c_str());
if (!*s) if (!*s)
throw IfaceParseError("Unable to open script file"); throw IfaceParseError("Unable to open script file");
pushScript(s,newprompt);
} }
/// \brief Provide a new input stream to execute, with an associated command prompt /// \brief Provide a new input stream to execute, with an associated command prompt