Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Fix DecoderNLS.Convert to out the correct value for 'completed' (#27229)
Browse files Browse the repository at this point in the history
Port #27210 to release/3.1
  • Loading branch information
GrabYourPitchforks authored Oct 17, 2019
1 parent b9c7399 commit 525f521
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,13 @@ public unsafe override void Convert(byte* bytes, int byteCount,
charsUsed = _encoding.GetChars(bytes, byteCount, chars, charCount, this);
bytesUsed = _bytesUsed;

// Its completed if they've used what they wanted AND if they didn't want flush or if we are flushed
completed = (bytesUsed == byteCount) && (!flush || !this.HasState) &&
(_fallbackBuffer == null || _fallbackBuffer.Remaining == 0);
// Per MSDN, "The completed output parameter indicates whether all the data in the input
// buffer was converted and stored in the output buffer." That means we've successfully
// consumed all the input _and_ there's no pending state or fallback data remaining to be output.

completed = (bytesUsed == byteCount)
&& !this.HasState
&& (_fallbackBuffer is null || _fallbackBuffer.Remaining == 0);

// Our data thingy are now full, we can return
}
Expand Down
4 changes: 4 additions & 0 deletions tests/CoreFX/CoreFX.issues.rsp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
# https://github.com/dotnet/coreclr/issues/22414
-nomethod System.Numerics.Tests.ToStringTest.RunRegionSpecificStandardFormatToStringTests

# Failure in System.Text.Encoding.Tests due to bug fix in DecoderNLS.Convert
# https://github.com/dotnet/coreclr/issues/27191
-nomethod System.Text.Tests.DecoderConvert2.PosTest6

# Timeout in System.Text.RegularExpressions.Tests.RegexMatchTests.Match_ExcessPrefix
# https://github.com/dotnet/coreclr/issues/18912
-nomethod System.Text.RegularExpressions.Tests.RegexMatchTests.Match_ExcessPrefix
Expand Down

0 comments on commit 525f521

Please sign in to comment.