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

Jump to bottom

[csharp] ByteString.CreateCodedInput should use ArraySegment offset and count #8740

Merged
merged 1 commit into from Jun 18, 2021
Merged

[csharp] ByteString.CreateCodedInput should use ArraySegment offset and count #8740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions csharp/src/Google.Protobuf.Test/ByteStringTest.cs
View file
Open in desktop
Expand Up @@ -210,6 +210,22 @@ public void UnsafeWrap()
Assert.AreEqual(byte.MaxValue, s[0]);
}

[Test]
public void CreateCodedInput_FromArraySegment()
{
byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
ByteString bs = UnsafeByteOperations.UnsafeWrap(data.AsMemory(2, 3));
CodedInputStream codedInputStream = bs.CreateCodedInput();

byte[] bytes = codedInputStream.ReadRawBytes(3);

Assert.AreEqual(3, bytes.Length);
Assert.AreEqual(2, bytes[0]);
Assert.AreEqual(3, bytes[1]);
Assert.AreEqual(4, bytes[2]);
Assert.IsTrue(codedInputStream.IsAtEnd);
}

[Test]
public void WriteToStream()
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Google.Protobuf/ByteString.cs
View file
Open in desktop
Expand Up @@ -325,7 +325,7 @@ public CodedInputStream CreateCodedInput()
if (MemoryMarshal.TryGetArray(bytes, out ArraySegment<byte> segment) && segment.Count == bytes.Length)
{
// Fast path. ByteString was created with a complete array.
return new CodedInputStream(segment.Array);
return new CodedInputStream(segment.Array, segment.Offset, segment.Count);
}
else
{
Expand Down