Decref all if ensure_fromlist fails. Fixes #876533.

Backported to 2.3.

diff --git a/Python/import.c b/Python/import.c
index e6ea3dd0a958c0c531d3a47530b5768fe2fa4466..5b9f162387324d0efcce989f426703a9b74a2af5 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -2104,9 +2104,10 @@ ensure_fromlist(PyObject *mod, PyObject *fromlist, char *buf, int buflen,
                        if (all == NULL)
                                PyErr_Clear();
                        else {
-                               if (!ensure_fromlist(mod, all, buf, buflen, 1))
-                                       return 0;
+                               int ret = ensure_fromlist(mod, all, buf, buflen, 1);
                                Py_DECREF(all);
+                               if (!ret)
+                                       return 0;
                        }
                        continue;
                }