mirror of
https://github.com/python/cpython.git
synced 2025-08-01 15:43:13 +00:00
compileall used the ctime of bytecode and source to determine if the bytecode
should be recreated. This created a timing hole. Fixed by just doing what import does; check the mtime and magic number.
This commit is contained in:
parent
322daea7c3
commit
28d108893c
4 changed files with 84 additions and 8 deletions
63
Lib/test/test_compileall.py
Normal file
63
Lib/test/test_compileall.py
Normal file
|
@ -0,0 +1,63 @@
|
|||
import compileall
|
||||
import imp
|
||||
import os
|
||||
import py_compile
|
||||
import shutil
|
||||
import struct
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
from test import test_support
|
||||
import unittest
|
||||
|
||||
|
||||
class CompileallTests(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.directory = tempfile.mkdtemp()
|
||||
self.source_path = os.path.join(self.directory, '_test.py')
|
||||
self.bc_path = self.source_path + ('c' if __debug__ else 'o')
|
||||
with open(self.source_path, 'w') as file:
|
||||
file.write('x = 123\n')
|
||||
|
||||
def tearDown(self):
|
||||
shutil.rmtree(self.directory)
|
||||
|
||||
def data(self):
|
||||
with open(self.bc_path, 'rb') as file:
|
||||
data = file.read(8)
|
||||
mtime = int(os.stat(self.source_path).st_mtime)
|
||||
compare = struct.pack('<4sl', imp.get_magic(), mtime)
|
||||
return data, compare
|
||||
|
||||
def recreation_check(self, metadata):
|
||||
"""Check that compileall recreates bytecode when the new metadata is
|
||||
used."""
|
||||
if not hasattr(os, 'stat'):
|
||||
return
|
||||
py_compile.compile(self.source_path)
|
||||
self.assertEqual(*self.data())
|
||||
with open(self.bc_path, 'rb') as file:
|
||||
bc = file.read()[len(metadata):]
|
||||
with open(self.bc_path, 'wb') as file:
|
||||
file.write(metadata)
|
||||
file.write(bc)
|
||||
self.assertNotEqual(*self.data())
|
||||
compileall.compile_dir(self.directory, force=False, quiet=True)
|
||||
self.assertTrue(*self.data())
|
||||
|
||||
def test_mtime(self):
|
||||
# Test a change in mtime leads to a new .pyc.
|
||||
self.recreation_check(struct.pack('<4sl', imp.get_magic(), 1))
|
||||
|
||||
def test_magic_number(self):
|
||||
# Test a change in mtime leads to a new .pyc.
|
||||
self.recreation_check(b'\0\0\0\0')
|
||||
|
||||
|
||||
def test_main():
|
||||
test_support.run_unittest(CompileallTests)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
Loading…
Add table
Add a link
Reference in a new issue