Fix entity buffer cache. Closes #7.

joehni · joehni · commit ae2acc233730 · 2025-10-10T00:13:18.000+02:00
diff --git a/changes.xml b/changes.xml
@@ -7,6 +7,7 @@
     </properties>
     <body>
         <release version="1.2.3-SNAPSHOT" date="yyyy-MM-dd" description="Maintenance version">
+            <action dev="joehni" type="fix" issue="7">Fix entity parser cache..</action>
             <action dev="joehni" type="add">Add KEYS file with public keys to verify signed artifacts.</action>
         </release>
         <release version="1.2.2" date="2021-08-19" description="Maintenance version">
diff --git a/src/main/java/io/github/xstream/mxparser/MXParser.java b/src/main/java/io/github/xstream/mxparser/MXParser.java
@@ -375,7 +375,7 @@ private void ensureEntityCapacity() {
     private Boolean xmlDeclStandalone;
     private String xmlDeclContent;
 
-    private static boolean noUnicode4;
+    private static boolean noUnicode4; // no Unicode in Java 1.4
 
     private void reset() {
         //System.out.println("reset() called");
@@ -2153,7 +2153,7 @@ else if(xmlnsPos == 5) {
         return ch;
     }
 
-    private char[] charRefOneCharBuf = new char[1];
+    final private char[] charRefOneCharBuf = new char[1];
 
     private char[] parseEntityRef()
         throws XmlPullParserException, IOException
@@ -2209,9 +2209,10 @@ private char[] parseEntityRef()
                 }
             }
             posEnd = pos - 1;
+            char[] result = null;
             if (!noUnicode4) {
                 try {
-                    charRefOneCharBuf = Character.toChars(Integer.parseInt(sb.toString(), isHex ? 16 : 10));
+                    result = Character.toChars(Integer.parseInt(sb.toString(), isHex ? 16 : 10));
                 } catch (IllegalArgumentException e) {
                     throw new XmlPullParserException("character reference (with "
                         + (isHex ? "hex" : "decimal")
@@ -2231,13 +2232,13 @@ private char[] parseEntityRef()
                             + sb.toString()
                             + ") is not supported in this runtime", this, null);
                 }
-                charRefOneCharBuf = new char[1];
+                result = charRefOneCharBuf;
                 charRefOneCharBuf[0] = (char)i;
             }
             if(tokenize) {
-                text = newString(charRefOneCharBuf, 0, charRefOneCharBuf.length);
+                text = newString(result, 0, result.length);
             }
-            return charRefOneCharBuf;
+            return result;
         } else {
             // [68]     EntityRef          ::=          '&' Name ';'
             // scan name until ;
diff --git a/src/test/java/io/github/xstream/mxparser/MXParserTest.java b/src/test/java/io/github/xstream/mxparser/MXParserTest.java
@@ -30,7 +30,6 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- *
  */
 public class MXParserTest
 {
@@ -255,6 +254,27 @@ public void testValidCharacterReferenceDecimal()
         }
     }
 
+    @Test
+    public void testAmpersandAfterSupplementaryCharacter()
+            throws Exception
+    {
+        MXParser parser = new MXParser();
+        String input = "<root>&amp; before, supplementary symbol &#1113101;, &amp; after</root>";
+        parser.setInput( new StringReader( input ) );
+
+        try
+        {
+            assertEquals( XmlPullParser.START_TAG, parser.nextToken() );
+            assertEquals( XmlPullParser.TEXT, parser.next() );
+            assertEquals( "& before, supplementary symbol \uDBFF\uDC0D, & after", parser.getText() );
+            assertEquals( XmlPullParser.END_TAG, parser.nextToken() );
+        }
+        catch ( XmlPullParserException e )
+        {
+            fail( "Should success since the input represents all legal character references" );
+        }
+    }
+
     @Test
     public void testValidCDATA()
         throws Exception
