Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 16 additions & 0 deletions CoreOSC.Tests/ParseTest.TestStringPadding.verified.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
Address: /test/strings,
Arguments: [
,
1,
12,
123,
1234,
12345,
1234,
123,
12,
1,

]
}
23 changes: 23 additions & 0 deletions CoreOSC.Tests/ParseTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,27 @@ public async Task TestNoAddress()

await Verify(msg2);
}

[Test]
public async Task TestStringPadding()
{
var msg = new OscMessage(
"/test/strings",
"",
"1",
"12",
"123",
"1234",
"12345",
"1234",
"123",
"12",
"1",
"");
var bytes = msg.GetBytes();

var msg2 = OscMessage.ParseMessage(bytes);

await Verify(msg2);
}
}
6 changes: 2 additions & 4 deletions CoreOSC/OscMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,8 @@ public static OscMessage ParseMessage(Span<byte> msg)
break;

case 's':
var stringVal = OscPacketUtils.GetString(msgReadOnlySpan, index);
var stringVal = OscPacketUtils.GetString(msgReadOnlySpan, index, out index);
arguments.Add(stringVal);
index += Encoding.UTF8.GetBytes(stringVal).Length;
break;

case 'b':
Expand Down Expand Up @@ -247,9 +246,8 @@ public static OscMessage ParseMessage(Span<byte> msg)
break;

case 'S':
var symbolVal = OscPacketUtils.GetString(msgReadOnlySpan, index);
var symbolVal = OscPacketUtils.GetString(msgReadOnlySpan, index, out index);
arguments.Add(new Symbol(symbolVal));
index += symbolVal.Length;
break;

case 'c':
Expand Down
3 changes: 2 additions & 1 deletion CoreOSC/OscPacketUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ public static int GetInt(ReadOnlySpan<byte> msg, int index) =>

public static float GetFloat(Span<byte> msg, int index) => BitConverter.ToSingle(msg.ReverseSlice(index, 4));

public static string GetString(ReadOnlySpan<byte> msg, int index)
public static string GetString(ReadOnlySpan<byte> msg, int index, out int newIndex)
{
var i = index + 4;
for (; i - 1 < msg.Length; i += 4)
{
if (msg[i - 1] != 0) continue;
newIndex = i;
return Encoding.UTF8.GetString(msg[index..i]).Replace("\0", "");
}

Comment thread
LucHeart marked this conversation as resolved.
Expand Down