Skip to content

[2.7] bpo-25862: Fix several bugs in the _io module. (GH-8026) #8033

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 3 commits into from
Dec 4, 2018
Merged

[2.7] bpo-25862: Fix several bugs in the _io module. (GH-8026) #8033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
459e793
[2.7] bpo-25862: Fix several bugs in the _io module. (GH-8026)
serhiy-storchaka Jun 30, 2018
c8d4ebf
Merge branch '2.7' into backport-fdb5a50-2.7
serhiy-storchaka Dec 4, 2018
61bc7dd
Make the code C89 compliant.
serhiy-storchaka Dec 4, 2018
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
4 changes: 3 additions & 1 deletion Modules/_io/stringio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,10 @@ stringio_getstate(stringio *self)
}
else {
dict = PyDict_Copy(self->dict);
if (dict == NULL)
if (dict == NULL) {
Py_DECREF(initvalue);
return NULL;
}
}

state = Py_BuildValue("(OOnN)", initvalue,
Expand Down
20 changes: 14 additions & 6 deletions Modules/_io/textio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,6 +1466,7 @@ textiowrapper_read_chunk(textio *self)
/* At the snapshot point, len(dec_buffer) bytes before the read, the
* next input to be decoded is dec_buffer + input_chunk.
*/
PyObject *snapshot;
PyObject *next_input = PyNumber_Add(dec_buffer, input_chunk);
if (next_input == NULL)
goto fail;
Expand All @@ -1477,8 +1478,13 @@ textiowrapper_read_chunk(textio *self)
Py_DECREF(next_input);
goto fail;
}
snapshot = Py_BuildValue("NN", dec_flags, next_input);
if (snapshot == NULL) {
dec_flags = NULL;
goto fail;
}
Py_XSETREF(self->snapshot, snapshot);
Py_DECREF(dec_buffer);
Py_XSETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input));
}
Py_DECREF(input_chunk);

Expand Down Expand Up @@ -2013,6 +2019,7 @@ textiowrapper_seek(textio *self, PyObject *args)
int whence = 0;
PyObject *res;
int cmp;
PyObject *snapshot;

CHECK_ATTACHED(self);

Expand Down Expand Up @@ -2149,11 +2156,11 @@ textiowrapper_seek(textio *self, PyObject *args)
goto fail;
}

self->snapshot = Py_BuildValue("iN", cookie.dec_flags, input_chunk);
if (self->snapshot == NULL) {
Py_DECREF(input_chunk);
snapshot = Py_BuildValue("iN", cookie.dec_flags, input_chunk);
if (snapshot == NULL) {
goto fail;
}
Py_XSETREF(self->snapshot, snapshot);

decoded = PyObject_CallMethod(self->decoder, "decode",
"Oi", input_chunk, (int)cookie.need_eof);
Expand All @@ -2171,9 +2178,10 @@ textiowrapper_seek(textio *self, PyObject *args)
self->decoded_chars_used = cookie.chars_to_skip;
}
else {
self->snapshot = Py_BuildValue("is", cookie.dec_flags, "");
if (self->snapshot == NULL)
snapshot = Py_BuildValue("is", cookie.dec_flags, "");
if (snapshot == NULL)
goto fail;
Py_XSETREF(self->snapshot, snapshot);
}

/* Finally, reset the encoder (merely useful for proper BOM handling) */
Expand Down