You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/08/09 03:43:57 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xpath/xml FormatterToHTML.java FormatterToXML.java
sboag 00/08/08 18:43:57
Modified: src/org/apache/xalan/xpath/xml FormatterToHTML.java
FormatterToXML.java
Log:
Escape attribute values for characters above 160. Thanks goes to "Voytenko, Dimitry" <DV...@SECTORBASE.COM> for pointing this out.
Revision Changes Path
1.35 +11 -2 xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java
Index: FormatterToHTML.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FormatterToHTML.java 2000/08/04 03:16:40 1.34
+++ FormatterToHTML.java 2000/08/09 01:43:56 1.35
@@ -399,8 +399,13 @@
// escape < characters occurring in attribute values.
m_attrCharsMap[(int)'<'] = '\0';
m_attrCharsMap[(int)'>'] = '\0';
- m_charsMap[0x0A] = 'S';
- m_charsMap[0x0D] = 'S';
+ m_attrCharsMap[0x0A] = 'S';
+ m_attrCharsMap[0x0D] = 'S';
+ int n = (255 > SPECIALSSIZE) ? 255 : SPECIALSSIZE;
+ for(int i = 160; i < n; i++)
+ {
+ m_attrCharsMap[i] = 'S';
+ }
}
/**
@@ -716,6 +721,10 @@
for (int i = 0; i < strLen; i ++)
{
char ch = chars[i];
+ // System.out.println("SPECIALSSIZE: "+SPECIALSSIZE);
+ // System.out.println("ch: "+(int)ch);
+ // System.out.println("m_maxCharacter: "+(int)m_maxCharacter);
+ // System.out.println("m_attrCharsMap[ch]: "+(int)m_attrCharsMap[ch]);
if((ch < SPECIALSSIZE) && (m_attrCharsMap[ch] != 'S'))
{
accum(ch);
1.36 +4 -0 xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
Index: FormatterToXML.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- FormatterToXML.java 2000/06/23 03:41:10 1.35
+++ FormatterToXML.java 2000/08/09 01:43:56 1.36
@@ -269,6 +269,10 @@
}
m_attrCharsMap[0x0A] = 'S';
m_attrCharsMap[0x0D] = 'S';
+ for(int i = m_maxCharacter; i < SPECIALSSIZE; i++)
+ {
+ m_attrCharsMap[i] = 'S';
+ }
}
/**