Decref all if ensure_fromlist fails. Fixes #876533.

Backported to 2.3.

Decref all if ensure_fromlist fails. Fixes #876533.
Backported to 2.3.
83969eee · Martin v. Löwis · 05f842ba · 83969eee
Commit 83969eee authored Mar 23, 2004 by Martin v. Löwis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Python/import.c Python/import.c +3 -2

No files found.
--- 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;
 		}