You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/04/26 00:40:57 UTC
svn commit: r651729 -
/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt
Date: Fri Apr 25 15:40:55 2008
New Revision: 651729
URL: http://svn.apache.org/viewvc?rev=651729&view=rev
Log:
Better fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617
Correctly handle quotes in attribute values for tag(x) files.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=651729&r1=651728&r2=651729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Apr 25 15:40:55 2008
@@ -1751,14 +1751,9 @@
out.print(" ");
out.print(attrs.getQName(i));
out.print("=");
- String quote = DOUBLE_QUOTE;
- String value = attrs.getValue(i);
- if (value.indexOf('"') != -1) {
- quote = SINGLE_QUOTE;
- }
- out.print(quote);
- out.print(value);
- out.print(quote);
+ out.print(DOUBLE_QUOTE);
+ out.print(attrs.getValue(i).replace("\"", """));
+ out.print(DOUBLE_QUOTE);
}
attrs = n.getAttributes();
@@ -1773,14 +1768,9 @@
out.print(attributeValue(jspAttrs[i], false, String.class));
out.print(" + \"\\\"");
} else {
- String quote = DOUBLE_QUOTE;
- String value = attrs.getValue(i);
- if (value.indexOf('"') != -1) {
- quote = SINGLE_QUOTE;
- }
- out.print(quote);
- out.print(value);
- out.print(quote);
+ out.print(DOUBLE_QUOTE);
+ out.print(attrs.getValue(i).replace("\"", """));
+ out.print(DOUBLE_QUOTE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org