XALANJ-2617 Fixed serializer for high-surrogate UTF-16 characters also for attribute values

Author: peterdemaeyer

src/org/apache/xml/serializer/ToStream.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /*
- * $Id$
+ * $Id: ToStream.java 1225444 2011-12-29 05:52:39Z mrglavas $
  */
 package org.apache.xml.serializer;
 
@@ -2109,6 +2109,7 @@ public void writeAttrString(
         }
         string.getChars(0,len, m_attrBuff, 0);   
         final char[] stringChars = m_attrBuff;
+        int lastDirtyCharProcessed = -1;
 
         for (int i = 0; i < len; i++)
         {
@@ -2118,7 +2119,7 @@ public void writeAttrString(
                 // The character is supposed to be replaced by a String
                 // e.g.   '&'  -->  "&amp;"
                 // e.g.   '<'  -->  "&lt;"
-                accumDefaultEscape(writer, ch, i, stringChars, len, false, true);
+                lastDirtyCharProcessed = accumDefaultEscape(writer, ch, i, stringChars, len, false, true);
             }
             else {
                 if (0x0 <= ch && ch <= 0x1F) {
@@ -2140,17 +2141,21 @@ public void writeAttrString(
 
                     case CharInfo.S_HORIZONAL_TAB:
                         writer.write("&#9;");
+                        lastDirtyCharProcessed = i;
                         break;
                     case CharInfo.S_LINEFEED:
                         writer.write("&#10;");
+                        lastDirtyCharProcessed = i;
                         break;
                     case CharInfo.S_CARRIAGERETURN:
                         writer.write("&#13;");
+                        lastDirtyCharProcessed = i;
                         break;
                     default:
                         writer.write("&#");
                         writer.write(Integer.toString(ch));
                         writer.write(';');
+                        lastDirtyCharProcessed = i;
                         break;
 
                     }
@@ -2159,23 +2164,31 @@ else if (ch < 0x7F) {
                     // Range 0x20 through 0x7E inclusive
                     // Normal ASCII chars
                         writer.write(ch);
+                    lastDirtyCharProcessed = i;
                 }
                 else if (ch <= 0x9F){
                     // Range 0x7F through 0x9F inclusive
                     // More control characters
                     writer.write("&#");
                     writer.write(Integer.toString(ch));
                     writer.write(';');
+                    lastDirtyCharProcessed = i;
                 }
                 else if (ch == CharInfo.S_LINE_SEPARATOR) {
                     // LINE SEPARATOR
                     writer.write("&#8232;");
+                    lastDirtyCharProcessed = i;
+                }
+                else if (Encodings.isHighUTF16Surrogate(ch)) {
+                    lastDirtyCharProcessed = processDirty(stringChars, len, i, ch, lastDirtyCharProcessed, false);
+                    i = lastDirtyCharProcessed;
                 }
                 else if (m_encodingInfo.isInEncoding(ch)) {
                     // If the character is in the encoding, and
                     // not in the normal ASCII range, we also
                     // just write it out
                     writer.write(ch);
+                    lastDirtyCharProcessed = i;
                 }
                 else {
                     // This is a fallback plan, we should never get here
@@ -2185,6 +2198,7 @@ else if (m_encodingInfo.isInEncoding(ch)) {
                     writer.write("&#");
                     writer.write(Integer.toString(ch));
                     writer.write(';');
+                    lastDirtyCharProcessed = i;
                 }
 
             }