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

[C#] fix parse failure for extensions with large field numbers #9591

Merged
merged 3 commits into from Mar 7, 2022
Merged

[C#] fix parse failure for extensions with large field numbers #9591

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e945b
test: add tests for a large field number
homuler Mar 6, 2022
8751981
fix: cast to uint after shifting
homuler Mar 6, 2022
355b7ce
remove an unnecessary test case
homuler Mar 7, 2022
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
19 changes: 19 additions & 0 deletions csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamTest.cs
View file
Open in desktop
Expand Up @@ -415,6 +415,25 @@ public void TestSlowPathAvoidance()
}
}

[Test]
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any reason you've added this test in here as well? We don't normally do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the review.
I didn't know where to add the test cases, so I added them to both files.
It seems unnecessary, so I'll delete this change.

public void MaximumFieldNumber()
{
MemoryStream ms = new MemoryStream();
CodedOutputStream output = new CodedOutputStream(ms);

int fieldNumber = 0x1FFFFFFF;
uint tag = WireFormat.MakeTag(fieldNumber, WireFormat.WireType.LengthDelimited);
output.WriteRawVarint32(tag);
output.WriteString("field 1");
output.Flush();
ms.Position = 0;

CodedInputStream input = new CodedInputStream(ms);

Assert.AreEqual(tag, input.ReadTag());
Assert.AreEqual(fieldNumber, WireFormat.GetTagFieldNumber(tag));
}

[Test]
public void Tag0Throws()
{
Expand Down
19 changes: 19 additions & 0 deletions csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
View file
Open in desktop
Expand Up @@ -716,6 +716,25 @@ public void TestSlowPathAvoidance()
}
}

[Test]
public void MaximumFieldNumber()
{
MemoryStream ms = new MemoryStream();
CodedOutputStream output = new CodedOutputStream(ms);

int fieldNumber = 0x1FFFFFFF;
uint tag = WireFormat.MakeTag(fieldNumber, WireFormat.WireType.LengthDelimited);
output.WriteRawVarint32(tag);
output.WriteString("field 1");
output.Flush();
ms.Position = 0;

CodedInputStream input = new CodedInputStream(ms);

Assert.AreEqual(tag, input.ReadTag());
Assert.AreEqual(fieldNumber, WireFormat.GetTagFieldNumber(tag));
}

[Test]
public void Tag0Throws()
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Google.Protobuf/WireFormat.cs
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ public static WireType GetTagWireType(uint tag)
/// </summary>
public static int GetTagFieldNumber(uint tag)
{
return (int) tag >> TagTypeBits;
return (int) (tag >> TagTypeBits);
Copy link
Contributor

Choose a reason for hiding this comment

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

Ouch, that was a subtle bug. Thanks for catching it.

}

/// <summary>
Expand Down