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/GP-3961_StructureExceptions'

Browse source 
(Closes #5719)
This commit is contained in:
Ryan Kurtz 2024-02-12 16:45:40 -05:00
commit 3efa8ce57e
4 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Features/Decompiler/src/decompile/cpp/grammar.cc
View file

@ -2793,8 +2793,11 @@ Datatype *CParse::newStruct(const string &ident,vector<TypeDeclarator *> *declis
} }
TypeStruct::assignFieldOffsets(sublist); TypeStruct::assignFieldOffsets(sublist);
if (!glb->types->setFields(sublist,res,-1,-1,0)) { try {
setError("Bad structure definition"); glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res); glb->types->destroyType(res);
return (Datatype *)0; return (Datatype *)0;
} }
@ -2826,8 +2829,11 @@ Datatype *CParse::newUnion(const string &ident,vector<TypeDeclarator *> *declist
sublist.emplace_back(i,0,decl->getIdentifier(),decl->buildType(glb)); sublist.emplace_back(i,0,decl->getIdentifier(),decl->buildType(glb));
} }
if (!glb->types->setFields(sublist,res,-1,-1,0)) { try {
setError("Bad union definition"); glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res); glb->types->destroyType(res);
return (Datatype *)0; return (Datatype *)0;
} }

14
Ghidra/Features/Decompiler/src/decompile/cpp/grammar.y
View file

@ -1047,8 +1047,11 @@ Datatype *CParse::newStruct(const string &ident,vector<TypeDeclarator *> *declis
} }
TypeStruct::assignFieldOffsets(sublist); TypeStruct::assignFieldOffsets(sublist);
if (!glb->types->setFields(sublist,res,-1,-1,0)) { try {
setError("Bad structure definition"); glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res); glb->types->destroyType(res);
return (Datatype *)0; return (Datatype *)0;
} }
@ -1080,8 +1083,11 @@ Datatype *CParse::newUnion(const string &ident,vector<TypeDeclarator *> *declist
sublist.emplace_back(i,0,decl->getIdentifier(),decl->buildType(glb)); sublist.emplace_back(i,0,decl->getIdentifier(),decl->buildType(glb));
} }
if (!glb->types->setFields(sublist,res,-1,-1,0)) { try {
setError("Bad union definition"); glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res); glb->types->destroyType(res);
return (Datatype *)0; return (Datatype *)0;
} }

31
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View file

@ -3247,8 +3247,7 @@ void TypeFactory::setDisplayFormat(Datatype *ct,uint4 format)
/// \param fixedsize is -1 or the forced size of the structure /// \param fixedsize is -1 or the forced size of the structure
/// \param fixedalign is -1 or the forced alignment for the structure /// \param fixedalign is -1 or the forced alignment for the structure
/// \param flags are other flags to set on the structure /// \param flags are other flags to set on the structure
/// \return true if modification was successful void TypeFactory::setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,int4 fixedalign,uint4 flags)
bool TypeFactory::setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,int4 fixedalign,uint4 flags)
{ {
if (!ot->isIncomplete()) if (!ot->isIncomplete())
@ -3260,8 +3259,10 @@ bool TypeFactory::setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,
for(iter=fd.begin();iter!=fd.end();++iter) { for(iter=fd.begin();iter!=fd.end();++iter) {
Datatype *ct = (*iter).type; Datatype *ct = (*iter).type;
// Do some sanity checks on the field // Do some sanity checks on the field
if (ct->getMetatype() == TYPE_VOID) return false; if (ct == (Datatype *)0 || ct->getMetatype() == TYPE_VOID)
if ((*iter).name.size() == 0) return false; throw LowlevelError("Bad field data-type for structure: "+ot->getName());
else if ((*iter).name.size() == 0)
throw LowlevelError("Bad field name for structure: "+ot->getName());
if ((*iter).offset != -1) { if ((*iter).offset != -1) {
int4 end = (*iter).offset + ct->getSize(); int4 end = (*iter).offset + ct->getSize();
@ -3281,18 +3282,16 @@ bool TypeFactory::setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,
tree.insert(ot); tree.insert(ot);
recalcPointerSubmeta(ot, SUB_PTR); recalcPointerSubmeta(ot, SUB_PTR);
recalcPointerSubmeta(ot, SUB_PTR_STRUCT); recalcPointerSubmeta(ot, SUB_PTR_STRUCT);
return true;
} }
/// If \b fixedsize is greater than 0, force the final structure to have that size. /// If \b fixedsize is greater than 0, force the final union to have that size.
/// This method should only be used on an incomplete union. It will mark the union as complete. /// This method should only be used on an incomplete union. It will mark the union as complete.
/// \param fd is the list of fields to set /// \param fd is the list of fields to set
/// \param ot is the TypeUnion object to modify /// \param ot is the TypeUnion object to modify
/// \param fixedsize is -1 or the forced size of the union /// \param fixedsize is -1 or the forced size of the union
/// \param fixedalign is -1 or the forced alignment for the union /// \param fixedalign is -1 or the forced alignment for the union
/// \param flags are other flags to set on the union /// \param flags are other flags to set on the union
/// \return true if modification was successful void TypeFactory::setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,int4 fixedalign,uint4 flags)
bool TypeFactory::setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,int4 fixedalign,uint4 flags)
{ {
if (!ot->isIncomplete()) if (!ot->isIncomplete())
@ -3302,9 +3301,12 @@ bool TypeFactory::setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,i
for(iter=fd.begin();iter!=fd.end();++iter) { for(iter=fd.begin();iter!=fd.end();++iter) {
Datatype *ct = (*iter).type; Datatype *ct = (*iter).type;
// Do some sanity checks on the field // Do some sanity checks on the field
if (ct->getMetatype() == TYPE_VOID) return false; if (ct == (Datatype *)0 || ct->getMetatype() == TYPE_VOID)
if ((*iter).offset != 0) return false; throw LowlevelError("Bad field data-type for union: "+ot->getName());
if ((*iter).name.size() == 0) return false; else if ((*iter).offset != 0)
throw LowlevelError("Non-zero field offset for union: "+ot->getName());
else if ((*iter).name.size() == 0)
throw LowlevelError("Bad field name for union: "+ot->getName());
} }
tree.erase(ot); tree.erase(ot);
@ -3312,7 +3314,6 @@ bool TypeFactory::setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,i
ot->flags &= ~(uint4)Datatype::type_incomplete; ot->flags &= ~(uint4)Datatype::type_incomplete;
ot->flags |= (flags & (Datatype::variable_length | Datatype::type_incomplete)); ot->flags |= (flags & (Datatype::variable_length | Datatype::type_incomplete));
tree.insert(ot); tree.insert(ot);
return true;
} }
/// The given prototype is copied into the given code data-type /// The given prototype is copied into the given code data-type
@ -4098,8 +4099,7 @@ Datatype* TypeFactory::decodeStruct(Decoder &decoder,bool forcecore)
throw LowlevelError("Redefinition of structure: " + ts.name); throw LowlevelError("Redefinition of structure: " + ts.name);
} }
else { // If structure is a placeholder stub else { // If structure is a placeholder stub
if (!setFields(ts.field,(TypeStruct*)ct,ts.size,ts.alignment,ts.flags)) // Define structure now by copying fields setFields(ts.field,(TypeStruct*)ct,ts.size,ts.alignment,ts.flags); // Define structure now by copying fields
throw LowlevelError("Bad structure definition");
} }
// decoder.closeElement(elemId); // decoder.closeElement(elemId);
return ct; return ct;
@ -4129,8 +4129,7 @@ Datatype* TypeFactory::decodeUnion(Decoder &decoder,bool forcecore)
throw LowlevelError("Redefinition of union: " + tu.name); throw LowlevelError("Redefinition of union: " + tu.name);
} }
else { // If structure is a placeholder stub else { // If structure is a placeholder stub
if (!setFields(tu.field,(TypeUnion*)ct,tu.size,tu.alignment,tu.flags)) // Define structure now by copying fields setFields(tu.field,(TypeUnion*)ct,tu.size,tu.alignment,tu.flags); // Define structure now by copying fields
throw LowlevelError("Bad union definition");
} }
// decoder.closeElement(elemId); // decoder.closeElement(elemId);
return ct; return ct;

4
Ghidra/Features/Decompiler/src/decompile/cpp/type.hh
View file

@ -746,8 +746,8 @@ public:
Datatype *findByName(const string &n); ///< Return type of given name Datatype *findByName(const string &n); ///< Return type of given name
Datatype *setName(Datatype *ct,const string &n); ///< Set the given types name Datatype *setName(Datatype *ct,const string &n); ///< Set the given types name
void setDisplayFormat(Datatype *ct,uint4 format); ///< Set the display format associated with the given data-type void setDisplayFormat(Datatype *ct,uint4 format); ///< Set the display format associated with the given data-type
bool setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,int4 fixedalign,uint4 flags); ///< Set fields on a TypeStruct void setFields(vector<TypeField> &fd,TypeStruct *ot,int4 fixedsize,int4 fixedalign,uint4 flags); ///< Set fields on a TypeStruct
bool setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,int4 fixedalign,uint4 flags); ///< Set fields on a TypeUnion void setFields(vector<TypeField> &fd,TypeUnion *ot,int4 fixedsize,int4 fixedalign,uint4 flags); ///< Set fields on a TypeUnion
void setPrototype(const FuncProto *fp,TypeCode *newCode,uint4 flags); ///< Set the prototype on a TypeCode void setPrototype(const FuncProto *fp,TypeCode *newCode,uint4 flags); ///< Set the prototype on a TypeCode
bool setEnumValues(const vector<string> &namelist, bool setEnumValues(const vector<string> &namelist,
const vector<uintb> &vallist, const vector<uintb> &vallist,