8000 gh-111942: Fix SystemError in the TextIOWrapper constructor by serhiy-storchaka · Pull Request #112061 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-111942: Fix SystemError in the TextIOWrapper constructor #112061

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 3 commits into from
Nov 14, 2023
Merged

gh-111942: Fix SystemError in the TextIOWrapper constructor #112061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a85bf3
gh-111942: Fix SystemError in the TextIOWrapper constructor
serhiy-storchaka Nov 14, 2023
f290520
Update Modules/_io/textio.c
vstinner Nov 14, 2023
43b222c
Enable test on embedded null in errors on _io test
vstinner Nov 14, 2023
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
Next Next commit
gh-111942: Fix SystemError in the TextIOWrapper constructor 
In non-debug more the check for the "errors" argument is skipped,
and then PyUnicode_AsUTF8() can fail, but its result was not checked.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Nov 14, 2023
commit 0a85bf3081010ba5dd2d57c261a2c0dae2ba412d
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-11-14-18-43-55.gh-issue-111942.x1pnrj.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix SystemError in the TextIOWrapper constructor with non-encodable "errors"
argument in non-debug mode.
8 changes: 6 additions & 2 deletions Modules/_io/textio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,10 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
else if (io_check_errors(errors)) {
return -1;
}
const char *errors_str = PyUnicode_AsUTF8(errors);
if (errors_str == NULL) {
return -1;
}

if (validate_newline(newline) < 0) {
return -1;
Expand Down Expand Up @@ -1184,11 +1188,11 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
/* Build the decoder object */
_PyIO_State *state = find_io_state_by_def(Py_TYPE(self));
self->state = state;
if (_textiowrapper_set_decoder(self, codec_info, PyUnicode_AsUTF8(errors)) != 0)
if (_textiowrapper_set_decoder(self, codec_info, errors_str) != 0)
goto error;

/* Build the encoder object */
if (_textiowrapper_set_encoder(self, codec_info, PyUnicode_AsUTF8(errors)) != 0)
if (_textiowrapper_set_encoder(self, codec_info, errors_str) != 0)
goto error;

/* Finished sorting out the codec details */
Expand Down
0