Plug a memory leak in com_import_stmt(): the tuple created to hold the

gvanrossum · gvanrossum · commit 83fb073a0307 · 2000-11-27T22:22:36.000Z
"..." in "from M import ..." was never DECREFed.  Leak reported by
James Slaughter and nailed by Barry, who also provided an earlier
version of this patch.
diff --git a/Python/compile.c b/Python/compile.c
@@ -2325,11 +2325,11 @@ static void
 com_import_stmt(struct compiling *c, node *n)
 {
 	int i;
-	PyObject *tup;
 	REQ(n, import_stmt);
 	/* 'import' dotted_name (',' dotted_name)* |
 	   'from' dotted_name 'import' ('*' | NAME (',' NAME)*) */
 	if (STR(CHILD(n, 0))[0] == 'f') {
+		PyObject *tup;
 		/* 'from' dotted_name 'import' ... */
 		REQ(CHILD(n, 1), dotted_name);
 		
@@ -2344,6 +2344,7 @@ com_import_stmt(struct compiling *c, node *n)
 			}
 		}
 		com_addoparg(c, LOAD_CONST, com_addconst(c, tup));
+		Py_DECREF(tup);
 		com_push(c, 1);
 		com_addopname(c, IMPORT_NAME, CHILD(n, 1));
 		if (TYPE(CHILD(n, 3)) == STAR) 

Original file line number	Diff line number	Diff line change
`@@ -2325,11 +2325,11 @@ static void`
`2325`	`2325`	`com_import_stmt(struct compiling c, node n)`
`2326`	`2326`	`{`
`2327`	`2327`	`int i;`
`2328`		`- PyObject *tup;`
`2329`	`2328`	`REQ(n, import_stmt);`
`2330`	`2329`	`/* 'import' dotted_name (',' dotted_name)* \|`
`2331`	`2330`	`'from' dotted_name 'import' ('' \| NAME (',' NAME)) */`
`2332`	`2331`	`if (STR(CHILD(n, 0))[0] == 'f') {`
	`2332`	`+ PyObject *tup;`
`2333`	`2333`	`/* 'from' dotted_name 'import' ... */`
`2334`	`2334`	`REQ(CHILD(n, 1), dotted_name);`
`2335`	`2335`
`@@ -2344,6 +2344,7 @@ com_import_stmt(struct compiling c, node n)`
`2344`	`2344`	`}`
`2345`	`2345`	`}`
`2346`	`2346`	`com_addoparg(c, LOAD_CONST, com_addconst(c, tup));`
	`2347`	`+ Py_DECREF(tup);`
`2347`	`2348`	`com_push(c, 1);`
`2348`	`2349`	`com_addopname(c, IMPORT_NAME, CHILD(n, 1));`
`2349`	`2350`	`if (TYPE(CHILD(n, 3)) == STAR)`