Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

annotate ByteString.CopyFrom(ReadOnlySpan<byte>) as SecuritySafeCritical #7701

Merged
merged 3 commits into from
Oct 27, 2020
Merged

annotate ByteString.CopyFrom(ReadOnlySpan<byte>) as SecuritySafeCritical #7701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead4518
annotate ByteString.CopyFrom(ReadOnlySpan<byte> bytes) as SecuritySaf…
basvdlinden Jul 12, 2020
12d7976
Added test for ByteString.CopyFrom(ReadOnlySpan<byte> bytes)
basvdlinden Jul 12, 2020
4c1bb4d
Remove newline
basvdlinden Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions csharp/src/Google.Protobuf.Test/ByteStringTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
1 change: 1 addition & 0 deletions csharp/src/Google.Protobuf/ByteString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down