diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 03:05:37 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 03:05:37 +0200 |
| commit | 65c153547ba6a41d11d3d04f84bacb5645a54e5e (patch) | |
| tree | 5feee1947fdb96d6176861f201e03bd5c4036a45 /Python | |
| parent | 13502b19c64b2cd37b0b2b66dfcc26d0f028cd84 (diff) | |
| download | cpython-git-65c153547ba6a41d11d3d04f84bacb5645a54e5e.tar.gz | |
Issue #12467: warnings: fix a race condition if a warning is emitted at
shutdown, if globals()['__file__'] is None.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/_warnings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 88be7db68f..8456796132 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())) |