From 3bb42d9341964fdf094c89c9a64965bd18588476 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 20 Oct 2007 03:43:15 +0000
Subject: [PATCH] Fix a memory leak caused by PyTokenizer_FindEncoding()
 returning a char * that was PyMem_MALLOC'ed.

---
 Python/import.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Python/import.c b/Python/import.c
index 323b55a540e..2a316caec9e 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2561,6 +2561,7 @@ call_find_module(char *name, PyObject *path)
 	struct filedescr *fdp;
 	char pathname[MAXPATHLEN+1];
 	FILE *fp = NULL;
+	char *found_encoding = NULL;
 	char *encoding = NULL;
 
 	pathname[0] = '\0';
@@ -2571,15 +2572,17 @@ call_find_module(char *name, PyObject *path)
 		return NULL;
 	if (fp != NULL) {
 		if (strchr(fdp->mode, 'b') == NULL) {
-			/* Python text file, get encoding from tokenizer */
-			encoding = PyTokenizer_FindEncoding(fp);
-			encoding = (encoding != NULL) ? encoding :
+			/* PyTokenizer_FindEncoding() returns PyMem_MALLOC'ed
+			   memory. */
+			found_encoding = PyTokenizer_FindEncoding(fp);
+			encoding = (found_encoding != NULL) ? found_encoding :
 				   (char*)PyUnicode_GetDefaultEncoding();
 		}
 		fob = PyFile_FromFileEx(fp, pathname, fdp->mode, fclose, -1,
 					(char*)encoding, NULL);
 		if (fob == NULL) {
 			fclose(fp);
+			PyMem_FREE(found_encoding);
 			return NULL;
 		}
 	}
@@ -2590,6 +2593,8 @@ call_find_module(char *name, PyObject *path)
 	ret = Py_BuildValue("Os(ssi)",
 		      fob, pathname, fdp->suffix, fdp->mode, fdp->type);
 	Py_DECREF(fob);
+	PyMem_FREE(found_encoding);
+
 	return ret;
 }