FIX: Trim ISO characters in the input (#4)

Fix: Robustness for ISO control characters at beginning or end of the XMP. Added some to the test data.

Author: StefanOltmann

src/commonMain/kotlin/com/ashampoo/xmp/impl/DomParser.kt

@@ -12,11 +12,23 @@ object DomParser {
 
     fun parseDocumentFromString(input: String): Document {
 
+        /*
+         * We encountered a situation where the XMP had NUL characters at the end
+         * for unknown reasons. This  caused an exception in the parser.
+         * The test images IMG_0001.jpg and IMG_0002.jpg on the iOS simulator
+         * exhibited this issue, indicating that it could occur in real-world
+         * scenarios as well. To address this, we now trim all whitespaces and
+         * ISO control characters from the XMP to ensure its proper parsing.
+         */
+        val trimmedInput = input.trim {
+            it.isWhitespace() || it.isISOControl()
+        }
+
         try {
 
             val writer = DomWriter()
 
-            val reader = XmlStreaming.newReader(input)
+            val reader = XmlStreaming.newReader(trimmedInput)
 
             do {
                 val event = reader.next()

src/commonTest/resources/com/ashampoo/xmp/sample_2.xmp

@@ -296,28 +296,29 @@
  </rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-<?xpacket end='w'?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end='w'?>
+