Prevent StackOverflowErrors when parsing the key property list (#269)

Fixes #267 Signed-off-by: Auke van Leeuwen <[email protected]>
prometheus · Apr 30, 2018 · 48108e3 · 48108e3
1 parent 4e445a0
commit 48108e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/collector/src/main/java/io/prometheus/jmx/JmxMBeanPropertyCache.java b/collector/src/main/java/io/prometheus/jmx/JmxMBeanPropertyCache.java
@@ -19,12 +19,8 @@ class JmxMBeanPropertyCache {
                     "(" + // Either
                     "\"" + // Quoted
                     "(?:" + // A possibly empty sequence of
-                    "[^\\\\\"]" + // Anything but backslash or quote
-                    "|\\\\\\\\" + // or an escaped backslash
-                    "|\\\\n" + // or an escaped newline
-                    "|\\\\\"" + // or an escaped quote
-                    "|\\\\\\?" + // or an escaped question mark
-                    "|\\\\\\*" + // or an escaped star
+                    "[^\\\\\"]*" + // Greedily match anything but backslash or quote
+                    "(?:\\\\.)?" + // Greedily see if we can match an escaped sequence
                     ")*" +
                     "\"" +
                     "|" + // Or

diff --git a/collector/src/test/java/io/prometheus/jmx/JmxMBeanPropertyCacheTest.java b/collector/src/test/java/io/prometheus/jmx/JmxMBeanPropertyCacheTest.java
@@ -1,9 +1,7 @@
 package io.prometheus.jmx;
 
-import org.junit.Assert;
 import org.junit.Test;
 
-import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import java.util.*;