Author: markt
Date: Sat Sep 9 20:53:23 2006
New Revision: 441898
URL: http://svn.apache.org/viewvc?view=rev&rev=441898
Log:
Fix bug 33356. Tag attributes with sequences of $ followed by 1 or more
non-special characters and then a { caused a jasper exception.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ELParser.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=441898&r1=441897&r2=441898
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Sep 9 20:53:23 2006
@@ -30,6 +30,11 @@
with the Tag represented by the containing tag file as their parent
tag. (markt)
</fix>
+ <fix>
+ <bug>33356</bug>: Tag attributes that contained $ followed by 1 or
+ more non-special characters and then a { character caused an
+ exception. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ELParser.java?view=diff&rev=441898&r1=441897&r2=441898
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ELParser.java
Sat Sep 9 20:53:23 2006
@@ -186,6 +186,7 @@
}
buf.append('$');
buf.append(ch);
+ prev = 0;
} else if (ch == '\\' || ch == '$') {
prev = ch;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
