diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-09-27 04:33:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 04:33:00 (GMT) |
| commit | f0db2dfda777ad3380e7816cabe4c4240f31687f (patch) | |
| tree | e0c4b32926ff2eab9ce997281840f9f70ffc6ea4 /Python/ceval.c | |
| parent | a1c49f6f09150f70f063417c8d67a38e59dde7ed (diff) | |
| download | cpython-f0db2dfda777ad3380e7816cabe4c4240f31687f.zip cpython-f0db2dfda777ad3380e7816cabe4c4240f31687f.tar.gz cpython-f0db2dfda777ad3380e7816cabe4c4240f31687f.tar.bz2 | |
[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)
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index b6ad444..9ad582b 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) { |