diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 22:53:29 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 22:53:29 +0000 |
| commit | eb54b65de4b5a79221891725f215d14a7019047a (patch) | |
| tree | 11b1139d7a1af66741acf7c82dc6e6be6ec71105 | |
| parent | 4f1dfa0b74e37df65f52fa13274362035b0ce65e (diff) | |
| download | cpython-eb54b65de4b5a79221891725f215d14a7019047a.tar.gz | |
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.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Python/marshal.c | 20 |
3 files changed, 10 insertions, 16 deletions
@@ -536,6 +536,7 @@ Piotr Meyer John Nagle Takahiro Nakayama Travers Naran +Charles-François Natali Fredrik Nehr Trent Nelson Tony Nelson @@ -12,6 +12,11 @@ What's New in Python 2.7 beta 2? Core and Builtins ----------------- +- 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. + - Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is passed to bytearray. diff --git a/Python/marshal.c b/Python/marshal.c index 9e4a6926a5..14f71346c8 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 } |