Skip to content

Ghidra is a software reverse engineering (SRE) framework

Properly iterate through resolvemap when remove resolve ranges

Daven Du3c7e4d150333
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc
index 0d2629940e..fa55275867 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc
@@ -2891,9 +2891,10 @@ void Database::clearResolve(Scope *scope)
res = resolvemap.find(rng.getFirstAddr());
while(res.first != res.second) {
if ((*res.first).scope == scope) {
- resolvemap.erase(res.first);
- break;
+ resolvemap.erase(res.first);
+ break;
}
+ res.first++;
}
}
}