Reduce chances of CME when iterating class info cache

embeddedt · Mar 29, 2024 · 226e4a3 · 226e4a3
1 parent ddffe93
commit 226e4a3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java b/common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java
@@ -70,7 +70,8 @@ private static void doClear() {
         MixinEnvironment.getDefaultEnvironment().audit();
         try {
             ClassNode emptyNode = new ClassNode();
-            classInfoCache.entrySet().removeIf(entry -> {
+            List<Map.Entry<String, ClassInfo>> entries = new ArrayList<>(classInfoCache.entrySet());
+            entries.stream().filter(entry -> {
                 if(entry.getKey().equals("java/lang/Object"))
                     return false;
                 ClassInfo mixinClz = entry.getValue();
@@ -88,7 +89,7 @@ private static void doClear() {
                     e.printStackTrace();
                 }
                 return true;
-            });
+            }).forEach(entry -> classInfoCache.remove(entry.getKey()));
         } catch (RuntimeException e) {
             e.printStackTrace();
         }