From 6b21fd3e5e00baef4852ec37282b266846b4239a Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 25 Apr 2008 22:40:55 +0000 Subject: [PATCH] Better fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617 Correctly handle quotes in attribute values for tag(x) files. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@651729 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Generator.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index 4f0a4f86d..5c6ab6867 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -1751,14 +1751,9 @@ class Generator { 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 @@ class Generator { 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); } } -- 2.11.0