Changeset 12925 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-10-04T23:39:08+02:00 (7 years ago)

Author:

bastiK

Message:

add safeguard for circular references leading to infinite loop (ref [12924])

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1421 +1421 @@
         PluginProxy err = null;
         List<StackTraceElement> stack = new ArrayList<>();
+        Set<Throwable> seen = new HashSet<>();
         Throwable current = ex;
         while (current != null) {
+            seen.add(current);
             stack.addAll(Arrays.asList(current.getStackTrace()));
-            current = current.getCause();
+            Throwable cause = current.getCause();
+            if (cause != null && seen.contains(cause)) {
+                break; // circular refernce
+            }
+            current = cause;
         }