Skip to content

Commit

Permalink
Fix DecoderNLS.Convert to out the correct value for 'completed' (dotn…
Browse files Browse the repository at this point in the history
…et#27229)

Port dotnet/coreclr#27210 to release/3.1

Signed-off-by: dotnet-bot <[email protected]>
  • Loading branch information
GrabYourPitchforks authored and dotnet-bot committed Nov 15, 2019
1 parent 435ae03 commit d79c831
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/Common/src/CoreLib/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

0 comments on commit d79c831

Please sign in to comment.