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

Merge remote-tracking branch

Browse source 
'origin/GP-3374_caheckman_PR-5191_jagunter_throw_new' into Ghidra_10.3
(Closes #5191, Closes #5182)
This commit is contained in:
Ryan Kurtz 2023-05-03 13:45:24 -04:00
commit d4b6ae4b16
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1945,7 +1945,7 @@ TypePartialStruct::TypePartialStruct(Datatype *contain,int4 off,int4 sz,Datatype
{ {
#ifdef CPUI_DEBUG #ifdef CPUI_DEBUG
if (contain->getMetatype() != TYPE_STRUCT && contain->getMetatype() != TYPE_ARRAY) if (contain->getMetatype() != TYPE_STRUCT && contain->getMetatype() != TYPE_ARRAY)
throw new LowlevelError("Parent of partial struct is not a struture or array"); throw LowlevelError("Parent of partial struct is not a struture or array");
#endif #endif
flags |= has_stripped; flags |= has_stripped;
stripped = strip; stripped = strip;
@ -2177,7 +2177,7 @@ void TypePointerRel::decode(Decoder &decoder,TypeFactory &typegrp)
offset = decoder.readSignedInteger(ATTRIB_CONTENT); offset = decoder.readSignedInteger(ATTRIB_CONTENT);
decoder.closeElement(subId); decoder.closeElement(subId);
if (offset == 0) if (offset == 0)
throw new LowlevelError("For metatype=\"ptrstruct\", <off> tag must not be zero"); throw LowlevelError("For metatype=\"ptrstruct\", <off> tag must not be zero");
submeta = SUB_PTRREL; submeta = SUB_PTRREL;
if (name.size() == 0) // If the data-type is not named if (name.size() == 0) // If the data-type is not named
markEphemeral(typegrp); // it is considered ephemeral markEphemeral(typegrp); // it is considered ephemeral