FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-141311: Avoid assertion in BytesIO readinto by cmaloney · Pull Request #141333 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-141311: Avoid assertion in BytesIO readinto #141333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 9 commits into from
Nov 12, 2025
Conversation 20 Commits 9 Checks 56 Files changed
Merged

gh-141311: Avoid assertion in BytesIO readinto #141333

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db81df6
gh-141311: Avoid assertion in BytesIO readinto
cmaloney Nov 10, 2025
34ed126
Tweak comment for correctness.
cmaloney Nov 10, 2025
2c84efe
Simplify by using sys.maxsize
cmaloney Nov 10, 2025
d119904
Reference io.BytesIO.readinto directly
cmaloney Nov 10, 2025
d78cc84
Resolve read_bytes_lock_held and audit other cases
cmaloney Nov 11, 2025
4c12be7
Update blurb for additional change
cmaloney Nov 11, 2025
e06d274
Update for review comments
cmaloney Nov 11, 2025
6cc0ab3
tweak blurb
cmaloney Nov 11, 2025
d205d4a
Improve precision of comments around the undefined behavior and safeties
cmaloney Nov 11, 2025
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
Update for review comments
  • Loading branch information
cmaloney committed Nov 11, 2025
commit e06d274092971c7e5bb2fa977dc4c2226bcf7521
10 changes: 3 additions & 7 deletions Modules/_io/bytesio.c
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,7 @@ read_bytes_lock_held(bytesio *self, Py_ssize_t size)
return Py_NewRef(self->buf);
}

/* gh-141311: avoid overflow with self->buf + self->pos */
if (self->pos >= PY_SSIZE_T_MAX - size) {
self->pos = PY_SSIZE_T_MAX;
size = 0;
}
/* gh-141311: avoid past end of self->buf access */
Comment thread
cmaloney marked this conversation as resolved.
Outdated
if (size == 0) {
return PyBytes_FromStringAndSize(NULL, 0);
}
Expand Down Expand Up @@ -619,12 +615,12 @@ _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer)
if (len > n) {
len = n;
if (len < 0) {
/* gh-141311: avoid overflow with self->buf + self->pos */
/* gh-141311: avoid past end of self->buf access */
return PyLong_FromSsize_t(0);
}
}

assert(self->pos + len < PY_SSIZE_T_MAX);
assert(self->pos + len <= PY_SSIZE_T_MAX);
assert(len >= 0);
memcpy(buffer->buf, PyBytes_AS_STRING(self->buf) + self->pos, len);
self->pos += len;
Expand Down
Back | FazBrowse Home | New Git URL