From 3c7e4d1503335db589064a08aa633e8bf19faed2 Mon Sep 17 00:00:00 2001
From: Daven Du <davendu@tencent.com>
Date: Fri, 27 Oct 2023 16:09:32 +0000
Subject: [PATCH] Properly iterate through resolvemap when remove resolve
 ranges

---
 Ghidra/Features/Decompiler/src/decompile/cpp/database.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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++;
     }
   }
 }