diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 22:53:29 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 22:53:29 (GMT) |
| commit | 18e63fbe64dc0c8dfd2b04bae1687f68c8d780bb (patch) | |
| tree | 8b6fb956b3f3c7f83a63f7e841d29a473241e477 /Python | |
| parent | 8a96d209f02e0e4cd3d515fa2722a72a89017b2f (diff) | |
| download | cpython-18e63fbe64dc0c8dfd2b04bae1687f68c8d780bb.zip cpython-18e63fbe64dc0c8dfd2b04bae1687f68c8d780bb.tar.gz cpython-18e63fbe64dc0c8dfd2b04bae1687f68c8d780bb.tar.bz2 | |
Issue #7332: Remove the 16KB stack-based buffer in
PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable
benefit compared to the dynamic memory allocation fallback. Patch by
Charles-François Natali.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/marshal.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/Python/marshal.c b/Python/marshal.c index 9e4a692..14f7134 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -1126,23 +1126,13 @@ getfilesize(FILE *fp) PyObject * PyMarshal_ReadLastObjectFromFile(FILE *fp) { -/* 75% of 2.1's .pyc files can exploit SMALL_FILE_LIMIT. - * REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. - */ -#define SMALL_FILE_LIMIT (1L << 14) +/* REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. */ #define REASONABLE_FILE_LIMIT (1L << 18) #ifdef HAVE_FSTAT off_t filesize; -#endif -#ifdef HAVE_FSTAT filesize = getfilesize(fp); - if (filesize > 0) { - char buf[SMALL_FILE_LIMIT]; - char* pBuf = NULL; - if (filesize <= SMALL_FILE_LIMIT) - pBuf = buf; - else if (filesize <= REASONABLE_FILE_LIMIT) - pBuf = (char *)PyMem_MALLOC(filesize); + if (filesize > 0 && filesize <= REASONABLE_FILE_LIMIT) { + char* pBuf = (char *)PyMem_MALLOC(filesize); if (pBuf != NULL) { PyObject* v; size_t n; @@ -1150,8 +1140,7 @@ PyMarshal_ReadLastObjectFromFile(FILE *fp) is smaller than REASONABLE_FILE_LIMIT */ n = fread(pBuf, 1, (int)filesize, fp); v = PyMarshal_ReadObjectFromString(pBuf, n); - if (pBuf != buf) - PyMem_FREE(pBuf); + PyMem_FREE(pBuf); return v; } @@ -1162,7 +1151,6 @@ PyMarshal_ReadLastObjectFromFile(FILE *fp) */ return PyMarshal_ReadObjectFromFile(fp); -#undef SMALL_FILE_LIMIT #undef REASONABLE_FILE_LIMIT } |