summaryrefslogtreecommitdiffstats
path: root/Python/import.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-24 16:44:06 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-24 16:44:06 (GMT)
commitd1c818a9c0a3684f57d7d00c6ec43763783ccf2a (patch)
tree6edb9b5c214c7012dbb6698ab6094def909adbab /Python/import.c
parentdfdc46f2749e784be756855e2ef33ba1bb74e9e8 (diff)
downloadcpython-d1c818a9c0a3684f57d7d00c6ec43763783ccf2a.zip
cpython-d1c818a9c0a3684f57d7d00c6ec43763783ccf2a.tar.gz
cpython-d1c818a9c0a3684f57d7d00c6ec43763783ccf2a.tar.bz2
Issue #11235: Fix OverflowError when trying to import a source file whose modification time doesn't fit in a 32-bit timestamp.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/Python/import.c b/Python/import.c
index c60ecfe..0e82390 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -981,14 +981,11 @@ load_source_module(char *name, char *pathname, FILE *fp)
}
#if SIZEOF_TIME_T > 4
/* Python's .pyc timestamp handling presumes that the timestamp fits
- in 4 bytes. This will be fine until sometime in the year 2038,
- when a 4-byte signed time_t will overflow.
+ in 4 bytes. Since the code only does an equality comparison,
+ ordering is not important and we can safely ignore the higher bits
+ (collisions are extremely unlikely).
*/
- if (st.st_mtime >> 32) {
- PyErr_SetString(PyExc_OverflowError,
- "modification time overflows a 4 byte field");
- return NULL;
- }
+ st.st_mtime &= 0xFFFFFFFF;
#endif
cpathname = make_compiled_pathname(pathname, buf,
(size_t)MAXPATHLEN + 1);