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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2021-10-07 08:16:36 -04:00
commit 1566bcb7e6
4 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2400,7 +2400,8 @@ void Heritage::heritage(void)
}
disjoint.add((*liter).first,(*liter).second.size,pass,prev);
}
else {
else { // Partially contained in old range, but may contain new stuff
disjoint.add((*liter).first,(*liter).second.size,pass,prev);
if ((!needwarning)&&(info->deadremoved>0)) {
// TODO: We should check if this varnode is tiled by previously heritaged ranges
if (vn->isHeritageKnown()) continue; // Assume that it is tiled and produced by merging
@ -2409,7 +2410,6 @@ void Heritage::heritage(void)
bumpDeadcodeDelay(vn);
warnvn = vn;
}
disjoint.add((*liter).first,(*liter).second.size,pass,prev);
}
}