mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 18:29:37 +02:00
Merge remote-tracking branch
'origin/GP-3374_caheckman_PR-5191_jagunter_throw_new' into Ghidra_10.3 (Closes #5191, Closes #5182)
This commit is contained in:
commit
d4b6ae4b16
1 changed files with 2 additions and 2 deletions
|
@ -1945,7 +1945,7 @@ TypePartialStruct::TypePartialStruct(Datatype *contain,int4 off,int4 sz,Datatype
|
|||
{
|
||||
#ifdef CPUI_DEBUG
|
||||
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
|
||||
flags |= has_stripped;
|
||||
stripped = strip;
|
||||
|
@ -2177,7 +2177,7 @@ void TypePointerRel::decode(Decoder &decoder,TypeFactory &typegrp)
|
|||
offset = decoder.readSignedInteger(ATTRIB_CONTENT);
|
||||
decoder.closeElement(subId);
|
||||
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;
|
||||
if (name.size() == 0) // If the data-type is not named
|
||||
markEphemeral(typegrp); // it is considered ephemeral
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue