Merge pull request #41 from trylock/master

Fix ArgumentOutOfRangeException in XmpUtils.PackageForJPEG
drewnoakes · Feb 3, 2019 · ab3d7e0 · ab3d7e0
2 parents 9d6aa6c + 27365dc
commit ab3d7e0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/XmpCore.Tests/XmpUtilsTests.cs b/XmpCore.Tests/XmpUtilsTests.cs
@@ -1,4 +1,6 @@
-using Xunit;
+using System.Text;
+using XmpCore.Impl;
+using Xunit;
 
 namespace XmpCore.Tests
 {
@@ -31,5 +33,18 @@ public void ConvertToLong()
             Assert.Throws<XmpException>(() => XmpUtils.ConvertToLong(null));
             Assert.Throws<XmpException>(() => XmpUtils.ConvertToLong("Foo"));
         }
+
+        [Fact]
+        public void PackageEmptyXmpDataToJPEG()
+        {
+            IXmpMeta data = new XmpMeta();
+            StringBuilder standard = new StringBuilder();
+            StringBuilder extended = new StringBuilder();
+            StringBuilder digest = new StringBuilder();
+
+            XmpUtils.PackageForJPEG(data, standard, extended, digest);
+
+            Assert.Equal(0, extended.Length);
+        }
     }
 }
diff --git a/XmpCore/Impl/XmpUtils.cs b/XmpCore/Impl/XmpUtils.cs
@@ -1477,7 +1477,9 @@ string ByteArrayToHexString(byte[] bytes)
             if (extraPadding > 2047)
                 extraPadding = 2047;
             //stdStr.delete(stdStr.toString().indexOf(kPacketTrailer), stdStr.length());
-            stdStr.Remove(stdStr.ToString().IndexOf(kPacketTrailer), stdStr.Length);
+            int index = stdStr.ToString().IndexOf(kPacketTrailer);
+            int length = stdStr.Length - index;
+            stdStr.Remove(index, length);
 
             stdStr.Append(' ', extraPadding);