Fix uninitialized variable access, release memory.

loewis · loewis · commit 7cd068baab4f · 2008-06-02T12:33:47.000Z
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -732,6 +732,7 @@ initstdio(void)
 	}
 
 	encoding = Py_GETENV("PYTHONIOENCODING");
+	errors = NULL;
 	if (encoding) {
 		encoding = strdup(encoding);
 		errors = strchr(encoding, ':');
@@ -825,6 +826,8 @@ initstdio(void)
 		status = -1;
 	}
 
+	if (encoding)
+		free(encoding);
 	Py_XDECREF(bimod);
 	Py_XDECREF(iomod);
 	return status;

Original file line number	Diff line number	Diff line change
`@@ -732,6 +732,7 @@ initstdio(void)`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`encoding = Py_GETENV("PYTHONIOENCODING");`
	`735`	`+ errors = NULL;`
`735`	`736`	`if (encoding) {`
`736`	`737`	`encoding = strdup(encoding);`
`737`	`738`	`errors = strchr(encoding, ':');`
`@@ -825,6 +826,8 @@ initstdio(void)`
`825`	`826`	`status = -1;`
`826`	`827`	`}`
`827`	`828`
	`829`	`+ if (encoding)`
	`830`	`+ free(encoding);`
`828`	`831`	`Py_XDECREF(bimod);`
`829`	`832`	`Py_XDECREF(iomod);`
`830`	`833`	`return status;`