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

fixed nested iteration bug

Browse Source
This commit is contained in:
caheckman 2019-06-04 18:24:17 -04:00
parent dadcb20918
commit b127e3c91b
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc
View File

@ -2341,6 +2341,7 @@ void ValueSetSolver::solve(int4 max)
componentStack.push_back(curSet->partHead);
curComponent = curSet->partHead;
curComponent->isDirty = false;
curComponent->startNode->looped(); // Reset component counter upon entry
}
if (curComponent != (Partition *)0) {
if (curSet->iterate())
@ -2349,7 +2350,7 @@ void ValueSetSolver::solve(int4 max)
curSet = curSet->next;
}
else {
do {
for(;;) {
if (curComponent->isDirty) {
curComponent->isDirty = false;
curSet = curComponent->startNode;
@ -2358,17 +2359,19 @@ void ValueSetSolver::solve(int4 max)
}
break;
}
else {
componentStack.pop_back();
if (componentStack.empty()) {
curComponent = (Partition *)0;
curSet = curSet->next;
break;
}
curComponent = componentStack.back();
curComponent->startNode->looped();
componentStack.pop_back();
if (componentStack.empty()) {
curComponent = (Partition *)0;
curSet = curSet->next;
break;
}
} while(curComponent->stopNode == curSet);
curComponent = componentStack.back();
if (curComponent->stopNode != curSet) {
curSet = curSet->next;
break;
}
}
}
}
else {