From f0db2dfda777ad3380e7816cabe4c4240f31687f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 27 Sep 2017 07:33:00 +0300 Subject: [PATCH] [3.6] bpo-31492: Fix assertion failures in case of a module with a bad __name__ attribute. (GH-3620). (#3773) (cherry picked from commit 6db7033192cd537ca987a65971acb01206c3ba82) --- Lib/test/test_import/__init__.py | 12 ++++++++++++ .../2017-09-16-22-49-16.bpo-31492.RtyteL.rst | 3 +++ Objects/moduleobject.c | 5 +---- Python/ceval.c | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index e8111214b9..b73a96f757 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -353,6 +353,18 @@ class ImportTests(unittest.TestCase): with self.assertRaises(ImportError): from test_from_import_AttributeError import does_not_exist + @cpython_only + def test_issue31492(self): + # There shouldn't be an assertion failure in case of failing to import + # from a module with a bad __name__ attribute, or in case of failing + # to access an attribute of such a module. + with swap_attr(os, '__name__', None): + with self.assertRaises(ImportError): + from os import does_not_exist + + with self.assertRaises(AttributeError): + os.does_not_exist + def test_concurrency(self): sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'data')) try: diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst new file mode 100644 index 0000000000..a8704738d1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-16-22-49-16.bpo-31492.RtyteL.rst @@ -0,0 +1,3 @@ +Fix assertion failures in case of failing to import from a module with a bad +``__name__`` attribute, and in case of failing to access an attribute of such +a module. Patch by Oren Milman. diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 79be51a806..f357af2b21 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -667,14 +667,11 @@ module_getattro(PyModuleObject *m, PyObject *name) if (m->md_dict) { _Py_IDENTIFIER(__name__); mod_name = _PyDict_GetItemId(m->md_dict, &PyId___name__); - if (mod_name) { + if (mod_name && PyUnicode_Check(mod_name)) { PyErr_Format(PyExc_AttributeError, "module '%U' has no attribute '%U'", mod_name, name); return NULL; } - else if (PyErr_Occurred()) { - PyErr_Clear(); - } } PyErr_Format(PyExc_AttributeError, "module has no attribute '%U'", name); diff --git a/Python/ceval.c b/Python/ceval.c index b6ad444e70..9ad582b15c 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5254,6 +5254,10 @@ import_from(PyObject *v, PyObject *name) if (pkgname == NULL) { goto error; } + if (!PyUnicode_Check(pkgname)) { + Py_CLEAR(pkgname); + goto error; + } fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name); Py_DECREF(pkgname); if (fullmodname == NULL) { -- 2.40.0