From 4856b0f34a6f4074cd86e66f11a635422374ae98 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sun, 24 Dec 2017 10:29:19 +0900 Subject: bpo-32402: io: Add missing NULL check. (GH-4971) _PyUnicode_FromId() may return NULL. Reported by coverity scan: CID 1426868, 1426867. --- Modules/_io/textio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 6800d2d..d776b5d 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1037,6 +1037,9 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, if (errors == Py_None) { errors = _PyUnicode_FromId(&PyId_strict); /* borrowed */ + if (errors == NULL) { + return -1; + } } else if (!PyUnicode_Check(errors)) { // Check 'errors' argument here because Argument Clinic doesn't support @@ -1249,6 +1252,9 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding, } else if (errors == Py_None) { errors = _PyUnicode_FromId(&PyId_strict); + if (errors == NULL) { + return -1; + } } const char *c_errors = PyUnicode_AsUTF8(errors); -- cgit v0.12