yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

GP-3961 Error messages for setFields

Browse source
This commit is contained in:
caheckman 2024-02-07 19:17:41 +00:00
parent bc24351495
commit a7ad4aef26
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);
if (!glb->types->setFields(sublist,res,-1,-1,0)) {
setError("Bad structure definition");
try {
glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res);
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));
}
if (!glb->types->setFields(sublist,res,-1,-1,0)) {
setError("Bad union definition");
try {
glb->types->setFields(sublist,res,-1,-1,0);
}
catch (LowlevelError &err) {
setError(err.explain);
glb->types->destroyType(res);
return (Datatype *)0;
}