[foundation] Fix empty NSData.ToArray() crash (#4103)

dotnet · May 18, 2018 · 07356b8 · 07356b8
1 parent 4e00419
commit 07356b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Foundation/NSData.cs b/src/Foundation/NSData.cs
@@ -47,7 +47,8 @@ internal NSData (IntPtr handle, bool owns)
 		public byte[] ToArray ()
 		{
 			var res = new byte [Length];
-			Marshal.Copy (Bytes, res, 0, res.Length);
+			if (Length > 0)
+				Marshal.Copy (Bytes, res, 0, res.Length);
 			return res;
 		}
 

diff --git a/tests/monotouch-test/Foundation/NSDataTest.cs b/tests/monotouch-test/Foundation/NSDataTest.cs
@@ -123,6 +123,15 @@ public void ToArray ()
 			}
 		}
 
+		[Test]
+		public void ToEmptyArray ()
+		{
+			using (var data = NSData.FromArray (new byte[0])) {
+				var arr = data.ToArray ();
+				Assert.AreEqual (0, arr.Length, "Length");
+			}
+		}
+
 		[Test]
 		public void BytesLength ()
 		{