Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 43608:f0bcc11ca965
Fix a memory leak caused by PyTokenizer_FindEncoding() returning a char * that
was PyMem_MALLOC'ed.
| author | Brett Cannon <bcannon@gmail.com> |
|---|---|
| date | Sat, 20 Oct 2007 03:43:15 +0000 |
| parents | a2bb76d11d66 |
| children | 0067a6ab4854 |
line wrap: on
line diff
--- a/Python/import.c Sat Oct 20 02:54:14 2007 +0000 +++ b/Python/import.c Sat Oct 20 03:43:15 2007 +0000 @@ -2561,6 +2561,7 @@ struct filedescr *fdp; char pathname[MAXPATHLEN+1]; FILE *fp = NULL; + char *found_encoding = NULL; char *encoding = NULL; pathname[0] = '\0'; @@ -2571,15 +2572,17 @@ 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 @@ ret = Py_BuildValue("Os(ssi)", fob, pathname, fdp->suffix, fdp->mode, fdp->type); Py_DECREF(fob); + PyMem_FREE(found_encoding); + return ret; }