Skip to content

[release/7.0] Base64.Decode: fixed latent bug for non-ASCII inputs #76812

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

Merged
carlossanlop merged 4 commits into from
Oct 10, 2022
Merged

[release/7.0] Base64.Decode: fixed latent bug for non-ASCII inputs #76812

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47ac72d
Added test cases
gfoidl Oct 9, 2022
e0d960d
Fix
gfoidl Oct 9, 2022
a235138
Use unicode escape sequence in tests
gfoidl Oct 9, 2022
ceca9ab
Apply suggestions from code review
adamsitnik Oct 10, 2022
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
Next Next commit
Added test cases
  • Loading branch information
@gfoidl
gfoidl authored and github-actions committed Oct 10, 2022
commit 47ac72dfc2d57460cfd9cfacdbfeebe1116fadc4
17 changes: 17 additions & 0 deletions src/libraries/System.Memory/tests/Base64/Base64DecoderUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,23 @@ public void BasicDecodingWithFinalBlockTrueKnownInputInvalid(string inputString,
Assert.True(Base64TestHelper.VerifyDecodingCorrectness(expectedConsumed, decodedBytes.Length, source, decodedBytes));
}

[Theory]
[InlineData("�z/T", 0, 0)] // scalar code-path
[InlineData("z/Ta123�", 4, 3)]
[InlineData("�z/TpH7sqEkerqMweH1uSw==", 0, 0)] // Vector128 code-path
[InlineData("z/TpH7sqEkerqMweH1uSw�==", 20, 15)]
[InlineData("�z/TpH7sqEkerqMweH1uSw1a5ebaAF9xa8B0ze1wet4epo==", 0, 0)] // Vector256 / AVX code-path
[InlineData("z/TpH7sqEkerqMweH1uSw1a5ebaAF9xa8B0ze1wet4epo�==", 44, 33)]
public void BasicDecodingNonAsciiInputInvalid(string inputString, int expectedConsumed, int expectedWritten)
{
Span<byte> source = Encoding.UTF8.GetBytes(inputString);
Span<byte> decodedBytes = new byte[Base64.GetMaxDecodedFromUtf8Length(source.Length)];

Assert.Equal(OperationStatus.InvalidData, Base64.DecodeFromUtf8(source, decodedBytes, out int consumed, out int decodedByteCount));
Assert.Equal(expectedConsumed, consumed);
Assert.Equal(expectedWritten, decodedByteCount); // expectedWritten == decodedBytes.Length
}

[Theory]
[InlineData("AQID", 3)]
[InlineData("AQIDBAUG", 6)]
Expand Down