Fix #329 where parsing of a string that starts at a buffer boundary incorrectly incorporates the entire buffer.

Author: pdvrieze

core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlWriter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025.
+ * Copyright (c) 2024-2026.
  *
  * This file is part of xmlutil.
  *
@@ -599,7 +599,7 @@ public fun XmlWriter.writeElementContent(missingNamespaces: MutableMap<String, S
     reader.forEach { type ->
         // We already moved to the next event. Add the namespaces before writing as for a DOM implementation
         // it is too late to do it afterwards.
-        if (reader.eventType == EventType.START_ELEMENT && missingNamespaces != null) {
+        if (type == EventType.START_ELEMENT && missingNamespaces != null) {
             @Suppress("DEPRECATION")
             addUndeclaredNamespaces(reader, missingNamespaces)
         }

core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/KtXmlReader.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025.
+ * Copyright (c) 2024-2026.
  *
  * This file is part of xmlutil.
  *
@@ -1026,6 +1026,7 @@ public class KtXmlReader internal constructor(
         var innerLoopEnd = minOf(bufCount, BUF_SIZE)
         var curPos = srcBufPos
 
+        // XXX (should not be loop)
         while (curPos < innerLoopEnd) {
             when (bufLeft[curPos]) {
                 ' ', '\t', '\n', '\r' -> break // whitespace
@@ -1048,8 +1049,11 @@ public class KtXmlReader internal constructor(
                         if (right > left + 1) pushRange(bufLeft, left, right)
                         right = -1
                         val peekChar = when (curPos + 1) {
-                            bufCount -> '\u0000'
-                            BUF_SIZE -> bufRight[0]
+                            bufCount ->
+                                '\u0000'
+
+                            BUF_SIZE ->
+                                bufRight[0]
                             else -> bufLeft[curPos + 1]
                         }
                         if (peekChar != '\n') {
@@ -1096,6 +1100,7 @@ public class KtXmlReader internal constructor(
             if (curPos == BUF_SIZE) { // swap the buffers
                 srcBufPos = curPos
                 swapInputBuffer()
+                right = -1 //set it to -1 in all cases as at this point we probably parsed nothing
                 curPos = srcBufPos
                 bufCount = srcBufCount
                 innerLoopEnd = minOf(bufCount, BUF_SIZE)

serialization-io/src/jvmTest/kotlin/net/devrieze/xmlutil/serialization/kxio/test/InvalidParseToWhitespaceKXIO329.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2026.
+ *
+ * This file is part of xmlutil.
+ *
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, you may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package net.devrieze.xmlutil.serialization.kxio.test
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import nl.adaptivity.xmlutil.XmlDeclMode
+import nl.adaptivity.xmlutil.core.impl.multiplatform.InputStream
+import nl.adaptivity.xmlutil.newReader
+import nl.adaptivity.xmlutil.serialization.XML
+import nl.adaptivity.xmlutil.serialization.XmlChildrenName
+import nl.adaptivity.xmlutil.serialization.XmlElement
+import nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy
+import nl.adaptivity.xmlutil.xmlStreaming
+import java.net.URI
+import kotlin.test.Test
+
+/** Test for #329 where a Maven POM file has content invalidly parsed as whitespace */
+class InvalidParseToWhitespaceKXIO329 {
+
+    private fun defaultFormat() = XML.recommended_1_0 {
+        policy {
+            autoPolymorphic = false
+            ignoreUnknownChildren()
+            encodeDefault = XmlSerializationPolicy.XmlEncodeDefault.NEVER
+        }
+        xmlDeclMode = XmlDeclMode.None
+        defaultToGenericParser = true
+    }
+
+    private fun getInputStream(online: Boolean = true): InputStream = when (online) {
+        true -> URI.create("https://repo.maven.apache.org/maven2/org/htmlunit/htmlunit/4.21.0/htmlunit-4.21.0.pom").toURL().openStream()
+        else -> javaClass.getResourceAsStream("/htmlunit-4.21.0.pom")!!
+    }
+
+    @Test
+    fun decodingHtmlUnitShouldWorkOnline() {
+        getInputStream(true).use { ins ->
+            xmlStreaming.newReader(ins).use { reader ->
+                val _ = defaultFormat().decodeFromReader<MavenInfo>(reader)
+            }
+        }
+    }
+
+    @Test
+    fun decodingHtmlUnitShouldWorkOffline() {
+        getInputStream(false).use { ins ->
+            xmlStreaming.newReader(ins).use { reader ->
+                val _ = defaultFormat().decodeFromReader<MavenInfo>(reader)
+            }
+        }
+    }
+
+
+
+    @Serializable
+    @SerialName("project")
+    internal data class MavenInfo(
+        @XmlElement(true) val name: String? = null,
+        @XmlElement(true) val url: String? = null,
+        @XmlChildrenName("dependency") val dependencies: List<Dependency> = emptyList(),
+        val scm: SCMInfos? = null,
+    )
+
+    @Serializable
+    @SerialName("dependency")
+    internal data class Dependency(
+        @XmlElement(true) val groupId: String,
+        @XmlElement(true) val artifactId: String,
+        @XmlElement(true) val version: String? = null,
+    )
+
+    @Serializable
+    @SerialName("scm")
+    internal data class SCMInfos(
+        @XmlElement(true) val url: String? = null,
+    )
+
+}