Fix Base64 decoding edge cases with small destinations and whitespace#123260
Merged
MihaZupan merged 3 commits intodotnet:mainfrom Jan 20, 2026
Merged
Fix Base64 decoding edge cases with small destinations and whitespace#123260MihaZupan merged 3 commits intodotnet:mainfrom
MihaZupan merged 3 commits intodotnet:mainfrom
Conversation
Contributor
|
Tagging subscribers to this area: @dotnet/area-system-memory |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes edge cases in Base64 decoding when dealing with small destination buffers and embedded whitespace in the input. The core issue was that the InvalidDataFallback method would get stuck when trying to decode data with whitespace interspersed in Base64 blocks when the destination buffer was too small to hold the complete decoded output.
Changes:
- Modified the loop exit condition in
InvalidDataFallbackto be more explicit about which statuses terminate the loop - Added logic to detect when
DecodeFromreturnsDestinationTooSmallbut makes no progress (localConsumed == 0), falling back to block-wise decoding in those cases - Added comprehensive test coverage for the edge case with whitespace-heavy input and small destination buffers
- Enhanced existing test assertions to verify
Base64.DecodeFromUtf8behavior is consistent withConvert.TryFromBase64String
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Helper/Base64DecoderHelper.cs | Fixed the InvalidDataFallback loop to properly handle DestinationTooSmall status by continuing to consume whitespace when progress is made, or falling back to block-wise decoding when stuck |
| src/libraries/System.Memory/tests/Base64/Base64DecoderUnitTests.cs | Added test case DecodingWithEmbeddedWhiteSpaceIntoSmallDestination_TrailingWhiteSpacesAreConsumed to verify trailing whitespace is properly consumed even with small destination buffers |
| src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.cs | Added assertions to existing parameterized tests to verify Base64.DecodeFromUtf8 behaves consistently with Convert methods across various input patterns |
This was referenced Jan 17, 2026
stephentoub
reviewed
Jan 20, 2026
...libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Helper/Base64DecoderHelper.cs
Outdated
Show resolved
Hide resolved
Member
|
/ba-g stuck in build analysis |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #123222
Fixes #123389
Replaces #123258
From
InvalidDataFallbackwe'll call back intoDecodeFromto try and process more data.But if the destination is too small and the next block of Base64 contains whitespace, it won't be able to make progress. Use the block-wise fallback in those cases.
Tests in #123151 now pass when including this change.