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

working fix

Browse source
This commit is contained in:
caheckman 2019-06-20 14:43:20 -04:00
parent cafbb77db0
commit 39d3a5f810
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5311,14 +5311,21 @@ int4 RuleEqual2Constant::applyOp(PcodeOp *op,Funcdata &data)
bool RulePtrArith::checkTerm(Varnode *vn,AddTreeState *state) bool RulePtrArith::checkTerm(Varnode *vn,AddTreeState *state)
{ {
uintb val,rem; uintb val;
intb rem;
Varnode *vnconst,*vnterm; Varnode *vnconst,*vnterm;
PcodeOp *def; PcodeOp *def;
if (vn == state->ptr) return false; if (vn == state->ptr) return false;
if (vn->isConstant()) { if (vn->isConstant()) {
val = vn->getOffset(); val = vn->getOffset();
rem = (state->size==0) ? val : val % state->size; if (state->size == 0)
rem = val;
else {
intb sval = (intb)val;
sign_extend(sval,vn->getSize()*8-1);
rem = sval % state->size;
}
if (rem!=0) { // constant is not multiple of size if (rem!=0) { // constant is not multiple of size
state->nonmultsum += val; state->nonmultsum += val;
return true; return true;
@ -5339,7 +5346,13 @@ bool RulePtrArith::checkTerm(Varnode *vn,AddTreeState *state)
vnterm = def->getIn(0); vnterm = def->getIn(0);
if (vnconst->isConstant()) { if (vnconst->isConstant()) {
val = vnconst->getOffset(); val = vnconst->getOffset();
rem = (state->size==0) ? val : val % state->size; if (state->size == 0)
rem = val;
else {
intb sval = (intb) val;
sign_extend(sval, vn->getSize() * 8 - 1);
rem = sval % state->size;
}
if (rem!=0) { if (rem!=0) {
if ((val > state->size)&&(state->size!=0)) { if ((val > state->size)&&(state->size!=0)) {
state->valid = false; // Size is too big: pointer type must be wrong state->valid = false; // Size is too big: pointer type must be wrong
@ -5421,7 +5434,14 @@ int4 RulePtrArith::transformPtr(PcodeOp *bottom_op,PcodeOp *ptr_op,int4 slot,Fun
if (!state.valid) return 0; // Were there any show stoppers if (!state.valid) return 0; // Were there any show stoppers
state.nonmultsum &= calc_mask(ptrsize); // Make sure we are modulo ptr's space state.nonmultsum &= calc_mask(ptrsize); // Make sure we are modulo ptr's space
state.multsum &= calc_mask(ptrsize); state.multsum &= calc_mask(ptrsize);
offset = (state.size==0) ? state.nonmultsum : state.nonmultsum % state.size; if (state.size == 0)
offset = state.nonmultsum;
else {
intb snonmult = (intb)state.nonmultsum;
sign_extend(snonmult,state.ptr->getSize()*8-1);
snonmult = snonmult % state.size;
offset = (snonmult < 0) ? (uintb)(snonmult + state.size) : (uintb)snonmult;
}
correct = state.nonmultsum - offset; correct = state.nonmultsum - offset;
state.nonmultsum = offset; state.nonmultsum = offset;
state.multsum = (state.multsum + correct)&calc_mask(ptrsize); // Some extra multiples of size state.multsum = (state.multsum + correct)&calc_mask(ptrsize); // Some extra multiples of size