Fix an edge case parser bug found while investigating BZ 57136

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1702092 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 9, 2015 · 7bd0e35 · 7bd0e35
1 parent 0d40741
commit 7bd0e35
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt
@@ -473,7 +473,7 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>();
    */
   < LITERAL_EXPRESSION:
     (   (~["$", "#", "\\"])* "\\" (["$", "#"])?
-      | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"])
+      | (~["$", "#"])* (["$", "#"] ~["{", "$", "#", "\\"])
       | (~["$", "#"])+
     )+
     | "$"

diff --git a/java/org/apache/el/parser/ELParserTokenManager.java b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -1,7 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. ELParserTokenManager.java */
 package org.apache.el.parser;
-import java.io.StringReader;
-import javax.el.ELException;
 
 /** Token Manager. */
 @SuppressWarnings("all") // Ignore warnings in generated code
@@ -187,7 +185,7 @@ else if (curChar == 92)
                   jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
-                  if ((0xf7ffffffffffffffL & l) == 0L)
+                  if ((0xf7ffffffefffffffL & l) == 0L)
                      break;
                   if (kind > 1)
                      kind = 1;

diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java
@@ -30,6 +30,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.el.lang.ELSupport;
@@ -207,6 +208,32 @@ public void testMixedTypes() {
         assertNotNull(e);
     }
 
+    @Test
+    public void testEscape01() {
+        Assert.assertEquals("$${", evaluateExpression("$\\${"));
+    }
+
+    @Test
+    public void testBug49081a() {
+        Assert.assertEquals("$2", evaluateExpression("$${1+1}"));
+    }
+
+    @Test
+    public void testBug49081b() {
+        Assert.assertEquals("#2", evaluateExpression("##{1+1}"));
+    }
+
+    @Test
+    public void testBug49081c() {
+        Assert.assertEquals("#2", evaluateExpression("#${1+1}"));
+    }
+
+    @Test
+    public void testBug49081d() {
+        Assert.assertEquals("$2", evaluateExpression("$#{1+1}"));
+    }
+
+
     // ************************************************************************
 
     private String evaluateExpression(String expression) {