Skip to content

#124513 - Guard Base64Url.DecodeFromChars against non-ASCII input #124540

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
tannergooding merged 6 commits into from
Feb 19, 2026
+8 −2
Merged

#124513 - Guard Base64Url.DecodeFromChars against non-ASCII input #124540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bad34a
Update Base64DecoderHelper.cs
Tomius Feb 17, 2026
699a010
Merge branch 'main' into patch-1
Tomius Feb 18, 2026
84919b5
Merge branch 'main' of https://github.com/Tomius/runtime into patch-1
Feb 18, 2026
d520189
Add unit test case for documentation
Feb 18, 2026
84a308d
Merge branch 'dotnet:main' into patch-1
Tomius Feb 18, 2026
03feb3d
Merge branch 'patch-1' of https://github.com/Tomius/runtime into patch-1
Feb 18, 2026
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
5 changes: 3 additions & 2 deletions src/libraries/System.Memory/tests/Base64Url/Base64UrlUnicodeAPIsUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
Expand Down Expand Up @@ -196,7 +196,8 @@ public static IEnumerable<object[]> EncodeToStringTests_TestData()
}

[Theory]
[InlineData("\u5948cz_T", 0, 0)] // scalar code-path
[InlineData("AB\u1000D", 0, 0)] // scalar code-path, non-ASCII char > 255 (https://github.com/dotnet/runtime/issues/124513)
[InlineData("\u5948cz_T", 0, 0)] // scalar code-path
[InlineData("z_Ta123\u5948", 4, 3)]
[InlineData("\u5948z_T-H7sqEkerqMweH1uSw==", 0, 0)] // Vector128 code-path
[InlineData("z_T-H7sqEkerqMweH1uSw\u5948==", 20, 15)]
Expand Down
5 changes: 5 additions & 0 deletions ...raries/System.Private.CoreLib/src/System/Buffers/Text/Base64Helper/Base64DecoderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ internal static unsafe OperationStatus DecodeFrom<TBase64Decoder, T>(TBase64Deco
Debug.Assert(typeof(TBase64Decoder) == typeof(Base64DecoderByte) ? remaining == 4 : remaining < 8);
int i0 = decoder.DecodeRemaining(srcEnd, ref decodingMap, remaining, out uint t2, out uint t3);

if (i0 < 0)
{
goto InvalidDataExit;
}

byte* destMax = destBytes + (uint)destLength;

if (!decoder.IsValidPadding(t3))
Expand Down
Loading