Skip to content

Need to escape quotes in attribute values #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OrangeDog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Need to escape quotes in attribute values #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions WEB-INF/src/org/cdlib/xtf/textIndexer/XMLTextProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,9 @@ private String processMetaAttribs(Attributes atts)
buf.append(' ');
String name = atts.getLocalName(i);
String value = atts.getValue(i);
buf.append(name + "=\"" + mapXMLChars(value) + "\"");
buf.append(name).append("=\"");
escapeXml(value, buf, true);
buf.append("\"");
} // for i

// All done.
Expand Down Expand Up @@ -2055,8 +2057,7 @@ public void flushCharacters()
// Map special XML characters to entities, so we can tell the difference
// between these and embedded XML in the meta-data.
//
tmp = mapXMLChars(tmp);
metaBuf.append(tmp);
escapeXml(tmp, metaBuf, false);
return;
}

Expand Down Expand Up @@ -2285,16 +2286,23 @@ public void flushCharacters()

/**
* Map special characters in XML to their entity equivalents.
*
* @param charSequence input text
* @param buf output buffer
* @param quot whether double-quotes also need escaping
*/
private String mapXMLChars(String str)
private void escapeXml(CharSequence charSequence, StringBuffer buf, boolean quot)
{
if (str.indexOf('&') >= 0)
str = str.replaceAll("&", "&");
if (str.indexOf('<') >= 0)
str = str.replaceAll("<", "&lt;");
if (str.indexOf('>') >= 0)
str = str.replaceAll(">", "&gt;");
return str;
for (int i = 0; i < charSequence.length(); i++) {
char c = charSequence.charAt(i);
switch (c) {
case '<': buf.append("&lt;"); break;
case '>': buf.append("&gt;"); break;
case '&': buf.append("&amp;"); break;
case '"': buf.append(quot ? "&quot;" : c); break;
default: buf.append(c); break;
}
}
}

//////////////////////////////////////////////////////////////////////////////
Expand Down