Reader.defaultDiscard: Fix for use with an indirect reader #25621
+19
−1
Conversation
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
If a Reader implementation implements `stream` by ignoring the Writer, writing directly to its internal buffer, and returning 0, then `defaultDiscard` would not update `seek` and also return 0, which is incorrect and can cause `discardShort` to violate the contract of `VTable.discard` by calling into `vtable.discard` with a non-empty buffer. This commit fixes the problem by advancing seek up to the limit after the stream call. This logic could likely be somewhat simplified in the future depending on how ziglang#25170 is resolved.
squeek502
force-pushed
the
reader-default-discard-indirect
branch
from
7f84fdd to
5f14aca
Compare
|
Also fixes: #25619 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
If a Reader implementation implements
streamby ignoring the Writer, writing directly to its internal buffer, and returning 0, thendefaultDiscardwould not updateseekand also return 0, which is incorrect and can causediscardShortto violate the contract ofVTable.discardby calling intovtable.discardwith a non-empty buffer.This commit fixes the problem by advancing seek up to the (remaining) limit after the stream call. This logic could likely be somewhat simplified in the future depending on how #25170 is resolved.
Fixes #25620, fixes #25619