Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4887_NearestArrayBug'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-03 06:39:39 -04:00
commit e0bf7b4c53
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
View File

@ -5762,8 +5762,8 @@ bool AddTreeState::hasMatchingSubType(int8 off,uint4 arrayHint,int8 *newoff) con
return true;
}
uint8 distBefore = offBefore;
uint8 distAfter = -offAfter;
uint8 distBefore = (offBefore < 0) ? -offBefore : offBefore;
uint8 distAfter = (offAfter < 0) ? -offAfter : offAfter;
if (arrayHint != 1) {
if (elSizeBefore != arrayHint)
distBefore += 0x1000;

33
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View File

@ -177,8 +177,8 @@ Datatype *Datatype::getSubType(int8 off,int8 *newoff) const
return (Datatype *)0;
}
/// Find the first component data-type after the given offset that is (or contains)
/// an array, and pass back the difference between the component's start and the given offset.
/// Find the first component data-type that is (or contains) an array starting after the given
/// offset, and pass back the difference between the component's start and the given offset.
/// Return the component data-type or null if no array is found.
/// \param off is the given offset into \b this data-type
/// \param newoff is used to pass back the offset difference
@ -190,8 +190,8 @@ Datatype *Datatype::nearestArrayedComponentForward(int8 off,int8 *newoff,int8 *e
return (TypeArray *)0;
}
/// Find the first component data-type before the given offset that is (or contains)
/// an array, and pass back the difference between the component's start and the given offset.
/// Find the last component data-type that is (or contains) an array starting before the given
/// offset, and pass back the difference between the component's start and the given offset.
/// Return the component data-type or null if no array is found.
/// \param off is the given offset into \b this data-type
/// \param newoff is used to pass back the offset difference
@ -1663,7 +1663,8 @@ int4 TypeStruct::getHoleSize(int4 off) const
Datatype *TypeStruct::nearestArrayedComponentBackward(int8 off,int8 *newoff,int8 *elSize) const
{
int4 i = getLowerBoundField(off);
int4 firstIndex = getLowerBoundField(off);
int4 i = firstIndex;
while(i >= 0) {
const TypeField &subfield( field[i] );
int8 diff = off - subfield.offset;
@ -1676,7 +1677,8 @@ Datatype *TypeStruct::nearestArrayedComponentBackward(int8 off,int8 *newoff,int8
}
else {
int8 suboff;
Datatype *res = subtype->nearestArrayedComponentBackward(subtype->getSize(), &suboff, elSize);
int8 remain = (i == firstIndex) ? diff : subtype->getSize() - 1;
Datatype *res = subtype->nearestArrayedComponentBackward(remain, &suboff, elSize);
if (res != (Datatype *)0) {
*newoff = diff;
return subtype;
@ -1691,10 +1693,22 @@ Datatype *TypeStruct::nearestArrayedComponentForward(int8 off,int8 *newoff,int8
{
int4 i = getLowerBoundField(off);
i += 1;
int8 remain;
if (i < 0) { // No component starting before off
i += 1; // First component starting after
remain = 0;
}
else {
const TypeField &subfield( field[i] );
remain = off - subfield.offset;
if (remain != 0 && (subfield.type->getMetatype() != TYPE_STRUCT || remain >= subfield.type->getSize())) {
i += 1; // Middle of non-structure that we must go forward from, skip over it
remain = 0;
}
}
while(i<field.size()) {
const TypeField &subfield( field[i] );
int8 diff = subfield.offset - off;
int8 diff = subfield.offset - off; // The first struct field examined may have a negative diff
if (diff > 128) break;
Datatype *subtype = subfield.type;
if (subtype->getMetatype() == TYPE_ARRAY) {
@ -1704,13 +1718,14 @@ Datatype *TypeStruct::nearestArrayedComponentForward(int8 off,int8 *newoff,int8
}
else {
int8 suboff;
Datatype *res = subtype->nearestArrayedComponentForward(0, &suboff, elSize);
Datatype *res = subtype->nearestArrayedComponentForward(remain, &suboff, elSize);
if (res != (Datatype *)0) {
*newoff = -diff;
return subtype;
}
}
i += 1;
remain = 0;
}
return (Datatype *)0;
}