gh-146379: Avoid StreamReader BufferError with active memoryview exports#146380
Open
MadLongTom wants to merge 2 commits intopython:mainfrom
Open
gh-146379: Avoid StreamReader BufferError with active memoryview exports#146380MadLongTom wants to merge 2 commits intopython:mainfrom
MadLongTom wants to merge 2 commits intopython:mainfrom
Conversation
…exports StreamReader methods (read, readline, readuntil, readexactly) raise BufferError when a memoryview is held on the internal buffer, because buffer mutations (take_bytes, del slice, clear) cannot resize a bytearray with active exports. Add _consume_buffer() helper that tries take_bytes() first, then falls back to non-mutating object replacement when BufferError is raised. Replace all buffer-consumption call sites in StreamReader to use _consume_buffer(). Also fix readline's LimitOverrunError handler which still used del-slice and .clear() instead of take_bytes(). Add 7 regression tests covering all affected methods with an active memoryview on the internal buffer.
|
Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool. If this change has little impact on Python users, wait for a maintainer to apply the |
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.
Description
Summary
This PR fixes
BufferErrorinasyncio.StreamReaderwhen a memoryview export exists on the internal buffer andStreamReaderperforms in-placebytearraymutation.Problem
Current
StreamReaderlogic includes in-place mutations (slice delete / clear). If a memoryview is active,bytearrayresizing raises:BufferError: Existing exports of data: object cannot be re-sizedChanges
StreamReaderbuffer-consumption paths to avoid in-place resize operations.bytearrayobjects in place.readreadlinereaduntilreadexactlyTests
Behavioral impact
Checklist
Fixes #146379