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

Some bug fixes for ptr arith

Browse source
This commit is contained in:
caheckman 2020-05-01 14:40:01 -04:00
parent 4f1adfcfc0
commit 5332624de8
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
View file

@ -5928,9 +5928,16 @@ bool AddTreeState::apply(void)
preventDistribution = true; preventDistribution = true;
spanAddTree(baseOp,1); spanAddTree(baseOp,1);
} }
calcSubtype();
}
if (!valid) {
// Distribution transforms were made
ostringstream s;
s << "Problems distributing in pointer arithmetic at ";
baseOp->getAddr().printRaw(s);
data.warningHeader(s.str());
return true;
} }
if (!valid)
throw LowlevelError("Problems distributing in ptrarith");
buildTree(); buildTree();
return true; return true;
} }

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

@ -1939,10 +1939,14 @@ Datatype *TypeFactory::downChain(Datatype *ptrtype,uintb &off)
if (ptrtype->metatype != TYPE_PTR) return (Datatype *)0; if (ptrtype->metatype != TYPE_PTR) return (Datatype *)0;
TypePointer *ptype = (TypePointer *)ptrtype; TypePointer *ptype = (TypePointer *)ptrtype;
Datatype *pt = ptype->ptrto; Datatype *pt = ptype->ptrto;
// If we know we have exactly one of an array, strip the array to get pointer to element
bool doStrip = (pt->getMetatype() != TYPE_ARRAY);
pt = pt->getSubType(off,&off); pt = pt->getSubType(off,&off);
if (pt == (Datatype *)0) if (pt == (Datatype *)0)
return (Datatype *)0; return (Datatype *)0;
if (doStrip)
return getTypePointerStripArray(ptype->size, pt, ptype->getWordSize()); return getTypePointerStripArray(ptype->size, pt, ptype->getWordSize());
return getTypePointer(ptype->size,pt,ptype->getWordSize());
} }
/// The data-type propagation system can push around data-types that are \e partial or are /// The data-type propagation system can push around data-types that are \e partial or are