diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 01:05:37 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 01:05:37 (GMT) |
| commit | 65c153547ba6a41d11d3d04f84bacb5645a54e5e (patch) | |
| tree | 5feee1947fdb96d6176861f201e03bd5c4036a45 | |
| parent | 13502b19c64b2cd37b0b2b66dfcc26d0f028cd84 (diff) | |
| download | cpython-65c153547ba6a41d11d3d04f84bacb5645a54e5e.zip cpython-65c153547ba6a41d11d3d04f84bacb5645a54e5e.tar.gz cpython-65c153547ba6a41d11d3d04f84bacb5645a54e5e.tar.bz2 | |
Issue #12467: warnings: fix a race condition if a warning is emitted at
shutdown, if globals()['__file__'] is None.
| -rw-r--r-- | Lib/test/test_warnings.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/_warnings.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index 5c4fa59..e502ed8 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -530,6 +530,18 @@ class _WarningsTests(BaseTest): assert expected_line self.assertEqual(second_line, expected_line) + def test_filename_none(self): + # issue #12467: race condition if a warning is emitted at shutdown + globals_dict = globals() + oldfile = globals_dict['__file__'] + try: + with original_warnings.catch_warnings(module=self.module) as w: + self.module.filterwarnings("always", category=UserWarning) + globals_dict['__file__'] = None + self.module.warn('test', UserWarning) + finally: + globals_dict['__file__'] = oldfile + class WarningsDisplayTests(unittest.TestCase): @@ -18,6 +18,9 @@ Core and Builtins Library ------- +- Issue #12467: warnings: fix a race condition if a warning is emitted at + shutdown, if globals()['__file__'] is None. + - Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by the garbage collector while the Heap lock is held. diff --git a/Python/_warnings.c b/Python/_warnings.c index 88be7db..8456796 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -491,7 +491,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno, /* Setup filename. */ *filename = PyDict_GetItemString(globals, "__file__"); - if (*filename != NULL) { + if (*filename != NULL && PyString_Check(*filename)) { Py_ssize_t len = PyString_Size(*filename); const char *file_str = PyString_AsString(*filename); if (file_str == NULL || (len < 0 && PyErr_Occurred())) |