antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Handle quotation mark escapes.

Browse source
This commit is contained in:
hns 2002-11-05 19:12:47 +00:00
parent 7f9c5d65c0
commit 5d021c5e0f
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helma/util/HtmlEncoder.java
View file

@ -326,6 +326,8 @@ public final class HtmlEncoder {
// swallowOneNewline is just effective once (for the next newline) // swallowOneNewline is just effective once (for the next newline)
boolean ignoreNewline = false; boolean ignoreNewline = false;
boolean swallowOneNewline = false; boolean swallowOneNewline = false;
// did we meet a backslash escape?
boolean escape = false;
for (int i=0; i<l; i++) { for (int i=0; i<l; i++) {
char c = str.charAt(i); char c = str.charAt(i);
@ -373,10 +375,6 @@ public final class HtmlEncoder {
int j = tagStart; int j = tagStart;
while (j<l && Character.isLetterOrDigit (str.charAt(j))) while (j<l && Character.isLetterOrDigit (str.charAt(j)))
j++; j++;
// if we haven't gotten past the <,
// check if it's an HTML comment or Helma macro tag
// if (j == tagStart && !insideCodeTag) {
// }
if (j > tagStart && j < l) { if (j > tagStart && j < l) {
String tagName = str.substring (tagStart, j).toLowerCase(); String tagName = str.substring (tagStart, j).toLowerCase();
if ("code".equals (tagName) && insideCloseTag && insideCodeTag) if ("code".equals (tagName) && insideCloseTag && insideCodeTag)
@ -408,17 +406,27 @@ public final class HtmlEncoder {
else else
ret.append ("&lt;"); ret.append ("&lt;");
break; break;
case '\\':
ret.append (c);
if (insideTag && !insideComment)
escape = !escape;
break;
case '"': case '"':
case '\'': case '\'':
ret.append (c); ret.append (c);
if (!insideComment) { if (!insideComment) {
// check if the quote is escaped
if (insideMacroTag) { if (insideMacroTag) {
if (macroQuoteChar == c) if (escape)
escape = false;
else if (macroQuoteChar == c)
macroQuoteChar = '\u0000'; macroQuoteChar = '\u0000';
else if (macroQuoteChar == '\u0000') else if (macroQuoteChar == '\u0000')
macroQuoteChar = c; macroQuoteChar = c;
} else if (insideHtmlTag) { } else if (insideHtmlTag) {
if (htmlQuoteChar == c) if (escape)
escape = false;
else if (htmlQuoteChar == c)
htmlQuoteChar = '\u0000'; htmlQuoteChar = '\u0000';
else if (htmlQuoteChar == '\u0000') else if (htmlQuoteChar == '\u0000')
htmlQuoteChar = c; htmlQuoteChar = c;
@ -467,6 +475,7 @@ public final class HtmlEncoder {
} }
if (swallowOneNewline && !insideTag && !Character.isWhitespace (c)) if (swallowOneNewline && !insideTag && !Character.isWhitespace (c))
swallowOneNewline = false; swallowOneNewline = false;
escape = false;
} }
} }
} }