8000 gh-119506: fix `_io.TextIOWrapper.write()` write during flush by chgnrdv · Pull Request #119507 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-119506: fix _io.TextIOWrapper.write() write during flush #119507

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
merged 14 commits into from
Jun 3, 2024
Merged

gh-119506: fix _io.TextIOWrapper.write() write during flush #119507

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b924dc
gh-119506: fix `_io.TextIOWrapper.write()` write during flush
chgnrdv May 24, 2024
f8fd659
📜🤖 Added by blurb_it.
blurb-it[bot] May 24, 2024
4809c1a
Update 2024-05-24-14-32-24.gh-issue-119506.-nMNqq.rst
chgnrdv May 24, 2024
e551b86
Merge branch 'main' into io-textiowrapper-fix-write-during-flush
chgnrdv May 24, 2024
2e72b28
Update 2024-05-24-14-32-24.gh-issue-119506.-nMNqq.rst
chgnrdv May 24, 2024
43628ce
refactor
chgnrdv May 24, 2024
a3fe68e
Update 2024-05-24-14-32-24.gh-issue-119506.-nMNqq.rst
chgnrdv May 24, 2024
c246d7f
Update 2024-05-24-14-32-24.gh-issue-119506.-nMNqq.rst
chgnrdv May 24, 2024
156940d
fixup
methane May 31, 2024
2392d20
fix test
methane May 31, 2024
02cf53a
add assert
methane Jun 1, 2024
483975c
simplify code and write more comments
methane Jun 1, 2024
01327f7
update test
methane Jun 1, 2024
26eadbe
update changelog
methane Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
@chgnrdv
chgnrdv committed May 24, 2024
commit 43628cec598c3cfce72990035e2e3075d7a92d4c
8 changes: 6 additions & 2 deletions Modules/_io/textio.c
< 10000 div class="file-actions pt-0 mb-md-0 mb-2 ml-md-2 flex-shrink-0 flex-md-justify-end">
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,6 +1719,8 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
bytes_len = PyBytes_GET_SIZE(b);
}

PyObject *pending = self->pending_bytes;

if (self->pending_bytes_count + bytes_len > self->chunk_size) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about while instead of if?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would also need a check to make sure that bytes_len > self->chunk_size isn't true.

// Prevent to concatenate more than chunk_size data.
if (_textiowrapper_writeflush(self) < 0) {
Expand All @@ -1728,9 +1730,9 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
if (self->pending_bytes) {
// gh-119506: call to _textiowrapper_writeflush()
// can write new data to pending_bytes
PyObject *tmp = self->pending_bytes;
pending = self->pending_bytes;
self->pending_bytes = b;
b = tmp;
b = pending;
}
}

Expand All @@ -1741,6 +1743,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
else if (!PyList_CheckExact(self->pending_bytes)) {
PyObject *list = PyList_New(2);
if (list == NULL) {
self->pending_bytes = pending;
Py_DECREF(b);
return NULL;
}
Expand All @@ -1750,6 +1753,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
}
else {
if (PyList_Append(self->pending_bytes, b) < 0) {
self->pending_bytes = pending;
Py_DECREF(b);
return NULL;
}
Expand Down
Loading
0