Skip to content

Fix MessagePackReader for multi-segment strings #1

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.

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

Merged
merged 3 commits into from
Apr 17, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions src/MessagePack/MessagePackReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ private string ReadStringSlow(int byteLength)
}
}
#endif
reader.Advance(bytesRead);
}

string value = new string(charArray, 0, initializedChars);
Expand Down
59 changes: 59 additions & 0 deletions tests/MessagePack.Tests/MessagePackReaderTests.ReadString.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using System;
using System.Buffers;
using Xunit;

namespace MessagePack.Tests
{
partial class MessagePackReaderTests
{
[Fact]
public void ReadString_HandlesSingleSegment()
{
var seq = BuildSequence(new[] {
(byte)(MessagePackCode.MinFixStr + 2),
(byte)'A', (byte)'B' });

var reader = new MessagePackReader(seq);
var result = reader.ReadString();
Assert.Equal("AB", result);
}

[Fact]
public void ReadString_HandlesMultipleSegments()
{
var seq = BuildSequence(
new[] { (byte)(MessagePackCode.MinFixStr + 2), (byte)'A' },
new[] { (byte)'B' });

var reader = new MessagePackReader(seq);
var result = reader.ReadString();
Assert.Equal("AB", result);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the fix, this assertion fails, because result equals "AA" instead of "AB".

}

ReadOnlySequence<T> BuildSequence<T>(params T[][] segmentContents)
{
var segments = new TestSequenceSegment<T>[segmentContents.Length];
TestSequenceSegment<T> last = null;
for (var i = 0; i < segmentContents.Length; i++)
{
last = segments[i] = new TestSequenceSegment<T>(segmentContents[i], last);
}

return new ReadOnlySequence<T>(segments[0], 0, last, last.Memory.Length);
}

class TestSequenceSegment<T> : ReadOnlySequenceSegment<T>
{
public TestSequenceSegment(T[] data, TestSequenceSegment<T> prev = null)
{
Memory = new Memory<T>(data);

if (prev != null)
{
prev.Next = this;
RunningIndex = prev.RunningIndex + prev.Memory.Length;
}
}
}
}
}