Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-23 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2178_TypedefStructMemoryError'

Browse Source 
into patch (Closes #4328)
This commit is contained in:
Ryan Kurtz 2022-06-15 01:21:49 -04:00
commit 47cda95669
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2763,14 +2763,14 @@ Datatype *TypeFactory::restoreTypedef(const Element *el)
if (defedType->getMetatype() == TYPE_STRUCT) {
// Its possible that a typedef of a struct is recursively defined, in which case
// an incomplete version may already be in the container
TypeStruct *prev = (TypeStruct *)findByIdLocal(nm, id);
if (prev != (Datatype *)0) {
if (defedType != prev->getTypedef())
throw LowlevelError("Trying to create typedef of existing type: " + prev->name);
TypeStruct *prevStruct = (TypeStruct *)findByIdLocal(nm, id);
if (prevStruct != (Datatype *)0) {
if (defedType != prevStruct->getTypedef())
throw LowlevelError("Trying to create typedef of existing type: " + prevStruct->name);
TypeStruct *defedStruct = (TypeStruct *)defedType;
if (prev->field.size() != defedStruct->field.size())
prev->field = defedStruct->field;
return prev;
if (prevStruct->field.size() != defedStruct->field.size())
setFields(defedStruct->field,prevStruct,defedStruct->size,defedStruct->flags);
return prevStruct;
}
}
return getTypedef(defedType, nm, id);