Issue #11235: Fix OverflowError when trying to import a source file whose modification time doesn't fit in a 32-bit timestamp.

This commit is contained in:
Antoine Pitrou 2012-01-24 17:44:06 +01:00
parent dfdc46f274
commit d1c818a9c0
3 changed files with 20 additions and 7 deletions

View File

@ -277,6 +277,19 @@ class ImportTests(unittest.TestCase):
finally:
os.rmdir(source)
def test_timestamp_overflow(self):
# A modification timestamp larger than 2**32 should not be a problem
# when importing a module (issue #11235).
source = TESTFN + ".py"
self.addCleanup(remove_files, TESTFN)
compiled = source + ('c' if __debug__ else 'o')
with open(source, 'w') as f:
pass
os.utime(source, (2 ** 33, 2 ** 33))
__import__(TESTFN)
# The pyc file was created.
os.stat(compiled)
class PycRewritingTests(unittest.TestCase):
# Test that the `co_filename` attribute on code objects always points

View File

@ -9,6 +9,9 @@ What's New in Python 2.7.3?
Core and Builtins
-----------------
- Issue #11235: Fix OverflowError when trying to import a source file whose
modification time doesn't fit in a 32-bit timestamp.
- Issue #11638: Unicode strings in 'name' and 'version' no longer cause
UnicodeDecodeErrors.

View File

@ -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);