From 4b9cdb7a074c13355a51db796f11386deadb43e4 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Sun, 19 Mar 2017 03:00:20 +0800 Subject: [PATCH 1/3] fix memory leak in import_from --- Python/ceval.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c index e682fc1afd0ed0..d3dcea76c68eb8 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5017,7 +5017,7 @@ import_from(PyObject *v, PyObject *name) { PyObject *x; _Py_IDENTIFIER(__name__); - PyObject *fullmodname, *pkgname, *pkgpath, *pkgname_or_unknown; + PyObject *fullmodname, *pkgname, *pkgpath, *pkgname_or_unknown, *errmsg; x = PyObject_GetAttr(v, name); if (x != NULL || !PyErr_ExceptionMatches(PyExc_AttributeError)) @@ -5032,6 +5032,7 @@ import_from(PyObject *v, PyObject *name) } fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name); if (fullmodname == NULL) { + Py_DECREF(pkgname); return NULL; } x = PyDict_GetItem(PyImport_GetModuleDict(), fullmodname); @@ -5056,17 +5057,21 @@ import_from(PyObject *v, PyObject *name) if (pkgpath == NULL || !PyUnicode_Check(pkgpath)) { PyErr_Clear(); - PyErr_SetImportError( - PyUnicode_FromFormat("cannot import name %R from %R (unknown location)", - name, pkgname_or_unknown), - pkgname, NULL); + errmsg = PyUnicode_FromFormat( + "cannot import name %R from %R (unknown location)", + name, pkgname_or_unknown + ); + /* doesn't check NULL for errmsg, PyErr_SetImportError will catch */ + PyErr_SetImportError(errmsg, pkgname, NULL); } else { - PyErr_SetImportError( - PyUnicode_FromFormat("cannot import name %R from %R (%S)", - name, pkgname_or_unknown, pkgpath), - pkgname, pkgpath); + errmsg = PyUnicode_FromFormat( + "cannot import name %R from %R (%S)", + name, pkgname_or_unknown, pkgpath + ); + PyErr_SetImportError(errmsg, pkgname, pkgpath); } + Py_XDECREF(errmsg); Py_XDECREF(pkgname_or_unknown); Py_XDECREF(pkgpath); return NULL; From 0dc322f83150b939ef740a9d9788524c581fabe8 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Mon, 20 Mar 2017 10:44:02 +0800 Subject: [PATCH 2/3] add NEWS --- Misc/NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 8509f52692d279..5ce9fba0dab726 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ What's New in Python 3.7.0 alpha 1? Core and Builtins ----------------- +- bpo-29849: Fix a memory leak when an ImportError is raised during from import. + - bpo-28856: Fix an oversight that %b format for bytes should support objects follow the buffer protocol. From 44c9d729bb6538e42bc7fa9773040dedc1664c25 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Tue, 21 Mar 2017 10:47:57 +0800 Subject: [PATCH 3/3] fix comment and style --- Python/ceval.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c index bf630bbfd509c8..fd60b7344a2c3e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5068,13 +5068,15 @@ import_from(PyObject *v, PyObject *name) "cannot import name %R from %R (unknown location)", name, pkgname_or_unknown ); - /* doesn't check NULL for errmsg, PyErr_SetImportError will catch */ + /* NULL check for errmsg done by PyErr_SetImportError. */ PyErr_SetImportError(errmsg, pkgname, NULL); - } else { + } + else { errmsg = PyUnicode_FromFormat( "cannot import name %R from %R (%S)", name, pkgname_or_unknown, pkgpath ); + /* NULL check for errmsg done by PyErr_SetImportError. */ PyErr_SetImportError(errmsg, pkgname, pkgpath); }