diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-06 02:34:51 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-06 02:34:51 +0200 |
| commit | 9146424d4d60bd9f2db88362ca1c3b069f966730 (patch) | |
| tree | 6c08dcf8db320c526713c43d1dbd63fa75262501 /Python/_warnings.c | |
| parent | c0e0064eac3135b0563c32fd2f0b14fe0928a7d3 (diff) | |
| download | cpython-9146424d4d60bd9f2db88362ca1c3b069f966730.tar.gz | |
Fix _warnings.c: make the filename string ready
Diffstat (limited to 'Python/_warnings.c')
| -rw-r--r-- | Python/_warnings.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 2bcca91fa6..792e3ed6df 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -497,9 +497,16 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno, /* Setup filename. */ *filename = PyDict_GetItemString(globals, "__file__"); if (*filename != NULL && PyUnicode_Check(*filename)) { - Py_ssize_t len = PyUnicode_GetSize(*filename); - int kind = PyUnicode_KIND(*filename); - void *data = PyUnicode_DATA(*filename); + Py_ssize_t len; + int kind; + void *data; + + if (PyUnicode_READY(*filename)) + goto handle_error; + + len = PyUnicode_GetSize(*filename); + kind = PyUnicode_KIND(*filename); + data = PyUnicode_DATA(*filename); /* if filename.lower().endswith((".pyc", ".pyo")): */ if (len >= 4 && |