Merge pull request #28 from anonyein/origin

Origin

Author: anonyein

src/main/java/org/jsoup/helper/Re2jRegex.java

@@ -18,6 +18,8 @@ public static Regex compile(String regex) {
             return new Re2jRegex(com.google.re2j.Pattern.compile(regex));
         } catch (RuntimeException e) {
             throw new ValidationException("Pattern syntax error: " + e.getMessage());
+        } catch (OutOfMemoryError | StackOverflowError e) { // defensive check on regex to normalize exception
+            throw new ValidationException("Pattern complexity error: " + e.getMessage());
         }
     }
 

src/main/java/org/jsoup/select/Evaluator.java

@@ -426,8 +426,10 @@ public AttributeKeyPair(String key, String value) {
             this.key = normalize(key);
             boolean quoted = value.startsWith("'") && value.endsWith("'")
                 || value.startsWith("\"") && value.endsWith("\"");
-            if (quoted)
+            if (quoted) {
+                Validate.isTrue(value.length() > 1, "Quoted value must have content");
                 value = value.substring(1, value.length() - 1);
+            }
 
             this.value = lowerCase(value); // case-insensitive match
         }

src/main/java/org/jsoup/select/QueryParser.java

@@ -346,6 +346,7 @@ private Evaluator byAttribute() {
     private Evaluator evaluatorForAttribute(TokenQueue cq) {
         String key = cq.consumeToAny(AttributeEvals); // eq, not, start, end, contain, match, (no val)
         Validate.notEmpty(key);
+        Validate.isFalse(key.equals("abs:"), "Absolute attribute key must have a name");
         cq.consumeWhitespace();
         final Evaluator eval;
 

src/test/java/org/jsoup/select/SelectorTest.java

@@ -1768,4 +1768,30 @@ public void testAncestorChain() {
         assertSelectedIds(doc.select("div[data*='']"), "1", "2", "3");
     }
 
+    @Test void parseExceptionOnEmptyAbsKey() {
+        // was previously firing at match time, not eval time
+        String q = "[abs:!=]";
+        boolean threw = false;
+        try {
+            Evaluator e = Selector.evaluatorOf(q);
+        } catch (Selector.SelectorParseException ex) {
+            threw = true;
+            assertEquals("Absolute attribute key must have a name", ex.getMessage());
+        }
+        assertTrue(threw);
+    }
+
+    @Test void parseExceptionOnEmptyKeyVal() {
+        // was previously firing at match time, not eval time
+        String q = "[\"=\"]";
+        boolean threw = false;
+        try {
+            Evaluator e = Selector.evaluatorOf(q);
+        } catch (Selector.SelectorParseException ex) {
+            threw = true;
+            assertEquals("Quoted value must have content", ex.getMessage());
+        }
+        assertTrue(threw);
+    }
+
 }