Merge pull request #7701 from basvdlinden/safe_bytestring_copyfrom_span

annotate ByteString.CopyFrom(ReadOnlySpan<byte>) as SecuritySafeCritical
protocolbuffers · Oct 27, 2020 · 9d9c670 · 9d9c670
2 parents 022078d + 4c1bb4d
commit 9d9c670
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/csharp/src/Google.Protobuf.Test/ByteStringTest.cs b/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
@@ -110,6 +110,18 @@ public void CopyFromByteArrayCopiesContents()
             Assert.AreEqual(10, bs[0]);
         }
 
+        [Test]
+        public void CopyFromReadOnlySpanCopiesContents()
+        {
+            byte[] data = new byte[1];
+            data[0] = 10;
+            ReadOnlySpan<byte> byteSpan = data;
+            var bs = ByteString.CopyFrom(byteSpan);
+            Assert.AreEqual(10, bs[0]);
+            data[0] = 5;
+            Assert.AreEqual(10, bs[0]);
+        }
+
         [Test]
         public void ToByteArrayCopiesContents()
         {

diff --git a/csharp/src/Google.Protobuf/ByteString.cs b/csharp/src/Google.Protobuf/ByteString.cs
@@ -245,6 +245,7 @@ public static ByteString CopyFrom(byte[] bytes, int offset, int count)
         /// are copied, so further modifications to the span will not
         /// be reflected in the returned <see cref="ByteString" />.
         /// </summary>
+        [SecuritySafeCritical]
         public static ByteString CopyFrom(ReadOnlySpan<byte> bytes)
         {
             return new ByteString(bytes.ToArray());