builtin_map(): A better fix for the previous leak plug (remember

warsaw · warsaw · commit fa77e09dd006 · 1999-01-28T18:49:12.000Z
PyList_Append steals a reference even if it fails).

builtin_filter(): Had the same leak problem as builtin_map().
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -232,8 +232,10 @@ builtin_filter(self, args)
 					goto Fail_1;
 			}
 			else {
+				int status = PyList_Append(result, item);
 				j++;
-				if (PyList_Append(result, item) < 0)
+				Py_DECREF(item);
+				if (status < 0)
 					goto Fail_1;
 			}
 		} else {
@@ -901,9 +903,10 @@ builtin_map(self, args)
 				goto Fail_1;
 		}
 		if (i >= len) {
-			if (PyList_Append(result, value) < 0)
-				goto Fail_1;
+			int status = PyList_Append(result, value);
 			Py_DECREF(value);
+			if (status < 0)
+				goto Fail_1;
 		}
 		else {
 			if (PyList_SetItem(result, i, value) < 0)

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,10 @@ builtin_filter(self, args)`
`232`	`232`	`goto Fail_1;`
`233`	`233`	`}`
`234`	`234`	`else {`
	`235`	`+ int status = PyList_Append(result, item);`
`235`	`236`	`j++;`
`236`		`- if (PyList_Append(result, item) < 0)`
	`237`	`+ Py_DECREF(item);`
	`238`	`+ if (status < 0)`
`237`	`239`	`goto Fail_1;`
`238`	`240`	`}`
`239`	`241`	`} else {`
`@@ -901,9 +903,10 @@ builtin_map(self, args)`
`901`	`903`	`goto Fail_1;`
`902`	`904`	`}`
`903`	`905`	`if (i >= len) {`
`904`		`- if (PyList_Append(result, value) < 0)`
`905`		`- goto Fail_1;`
	`906`	`+ int status = PyList_Append(result, value);`
`906`	`907`	`Py_DECREF(value);`
	`908`	`+ if (status < 0)`
	`909`	`+ goto Fail_1;`
`907`	`910`	`}`
`908`	`911`	`else {`
`909`	`912`	`if (PyList_SetItem(result, i, value) < 0)`