Decref all if ensure_fromlist fails. Fixes #876533.

loewis · loewis · commit 83969eeeeb08 · 2004-03-23T16:28:13.000Z
Backported to 2.3.
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -2104,9 +2104,10 @@ ensure_fromlist(PyObject mod, PyObject fromlist, char *buf, int buflen,`
`2104`	`2104`	`if (all == NULL)`
`2105`	`2105`	`PyErr_Clear();`
`2106`	`2106`	`else {`
`2107`		`- if (!ensure_fromlist(mod, all, buf, buflen, 1))`
`2108`		`- return 0;`
	`2107`	`+ int ret = ensure_fromlist(mod, all, buf, buflen, 1);`
`2109`	`2108`	`Py_DECREF(all);`
	`2109`	`+ if (!ret)`
	`2110`	`+ return 0;`
`2110`	`2111`	`}`
`2111`	`2112`	`continue;`
`2112`	`2113`	`}`