Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 06:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-4929_ryanmkurtz_PR-6890_wbierman_resolve_sleigh_uaf'

Browse Source 
into Ghidra_11.2 (Closes #6890)
This commit is contained in:
Ryan Kurtz 2024-09-13 11:53:39 -04:00
commit fb6445277a
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.cc
View File

@ -33,7 +33,7 @@ ElementId ELEM_DESCRIPTION = ElementId("description",233);
ElementId ELEM_LANGUAGE = ElementId("language",234);
ElementId ELEM_LANGUAGE_DEFINITIONS = ElementId("language_definitions",235);
map<int4,Sleigh *> SleighArchitecture::translators;
map<int4,Sleigh> SleighArchitecture::translators;
vector<LanguageDescription> SleighArchitecture::description;
FileManage SleighArchitecture::specpaths; // Global specfile manager
@ -174,17 +174,16 @@ bool SleighArchitecture::isTranslateReused(void)
Translate *SleighArchitecture::buildTranslator(DocumentStorage &store)
{ // Build a sleigh translator
map<int4,Sleigh *>::const_iterator iter;
Sleigh *sleigh;
map<int4,Sleigh>::iterator iter;
iter = translators.find(languageindex);
if (iter != translators.end()) {
sleigh = (*iter).second;
sleigh->reset(loader,context);
return sleigh;
iter->second.reset(loader, context);
return &iter->second;
}
sleigh = new Sleigh(loader,context);
translators[languageindex] = sleigh;
return sleigh;
pair<map<int4,Sleigh>::iterator,bool> res;
res = translators.emplace(piecewise_construct,forward_as_tuple(languageindex),forward_as_tuple(loader,context));
return &(*res.first).second;
}
PcodeInjectLibrary *SleighArchitecture::buildPcodeInjectLibrary(void)
@ -627,10 +626,6 @@ const vector<LanguageDescription> &SleighArchitecture::getDescriptions(void)
void SleighArchitecture::shutdown(void)
{
if (translators.empty()) return; // Already cleared
for(map<int4,Sleigh *>::const_iterator iter=translators.begin();iter!=translators.end();++iter)
delete (*iter).second;
translators.clear();
// description.clear(); // static vector is destroyed by the normal exit handler
}

2
Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.hh
View File

@ -106,7 +106,7 @@ public:
/// Generally a \e language \e id (i.e. x86:LE:64:default) is provided, then this
/// object is able to automatically load in configuration and construct the Translate object.
class SleighArchitecture : public Architecture {
static map<int4,Sleigh *> translators; ///< Map from language index to instantiated translators
static map<int4,Sleigh> translators; ///< Map from language index to instantiated translators
static vector<LanguageDescription> description; ///< List of languages we know about
int4 languageindex; ///< Index (within LanguageDescription array) of the active language
string filename; ///< Name of active load-image file