Commit 4856b0f3 authored by INADA Naoki's avatar INADA Naoki Committed by GitHub

bpo-32402: io: Add missing NULL check. (GH-4971)

_PyUnicode_FromId() may return NULL.

Reported by coverity scan: CID 1426868, 1426867.
parent 719ccbca
...@@ -1037,6 +1037,9 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, ...@@ -1037,6 +1037,9 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
if (errors == Py_None) { if (errors == Py_None) {
errors = _PyUnicode_FromId(&PyId_strict); /* borrowed */ errors = _PyUnicode_FromId(&PyId_strict); /* borrowed */
if (errors == NULL) {
return -1;
}
} }
else if (!PyUnicode_Check(errors)) { else if (!PyUnicode_Check(errors)) {
// Check 'errors' argument here because Argument Clinic doesn't support // Check 'errors' argument here because Argument Clinic doesn't support
...@@ -1249,6 +1252,9 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding, ...@@ -1249,6 +1252,9 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
} }
else if (errors == Py_None) { else if (errors == Py_None) {
errors = _PyUnicode_FromId(&PyId_strict); errors = _PyUnicode_FromId(&PyId_strict);
if (errors == NULL) {
return -1;
}
} }
const char *c_errors = PyUnicode_AsUTF8(errors); const char *c_errors = PyUnicode_AsUTF8(errors);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment