Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2157_addendum'

Browse Source
This commit is contained in:
Ryan Kurtz 2022-06-21 17:51:20 -04:00
commit 6c7519d5ea
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1277,7 +1277,7 @@ void Architecture::parseCompilerConfig(DocumentStorage &store)
uint4 elemId = decoder.openElement(ELEM_COMPILER_SPEC);
for(;;) {
uint subId = decoder.peekElement();
uint4 subId = decoder.peekElement();
if (subId == 0) break;
if (subId == ELEM_DEFAULT_PROTO)
decodeDefaultProto(decoder);

2
Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
View File

@ -3185,7 +3185,7 @@ void ProtoStoreInternal::decode(Decoder &decoder,ProtoModel *model)
uint4 elemId = decoder.openElement(ELEM_INTERNALLIST);
for(;;) { // This is only the input params
uint subId = decoder.openElement(); // <retparam> or <param>
uint4 subId = decoder.openElement(); // <retparam> or <param>
if (subId == 0) break;
string name;
uint4 flags = 0;

2
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View File

@ -3753,7 +3753,7 @@ void TypeFactory::decodeCoreTypes(Decoder &decoder)
void TypeFactory::decodeDataOrganization(Decoder &decoder)
{
uint elemId = decoder.openElement(ELEM_DATA_ORGANIZATION);
uint4 elemId = decoder.openElement(ELEM_DATA_ORGANIZATION);
for(;;) {
uint4 subId = decoder.openElement();
if (subId == 0) break;