From: INADA Naoki <methane@users.noreply.github.com>
Date: Sun, 24 Dec 2017 01:29:19 +0000 (+0900)
Subject: bpo-32402: io: Add missing NULL check. (GH-4971)
X-Git-Tag: v3.7.0a4~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4856b0f34a6f4074cd86e66f11a635422374ae98;p=thirdparty%2FPython%2Fcpython.git

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

_PyUnicode_FromId() may return NULL.

Reported by coverity scan: CID 1426868, 1426867.
---

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 6800d2dd2535..d776b5de6991 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);