diff options
| author | Christian Heimes <christian@python.org> | 2014-02-04 23:29:48 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2014-02-04 23:29:48 (GMT) |
| commit | 25ff287dd7a8ed43b99433796f2d1dcf78efa878 (patch) | |
| tree | f313edc91ec322c4ea9fd1e12c3afa9ba0d024fc /Modules/_tkinter.c | |
| parent | 3b55f0c6226a1a1b56c661246dbbcce1bc2e3d76 (diff) | |
| parent | d33491ea76b3898d5fd0fe3ae75e73ea157a7186 (diff) | |
| download | cpython-25ff287dd7a8ed43b99433796f2d1dcf78efa878.zip cpython-25ff287dd7a8ed43b99433796f2d1dcf78efa878.tar.gz cpython-25ff287dd7a8ed43b99433796f2d1dcf78efa878.tar.bz2 | |
Issue #20515: Fix NULL pointer dereference introduced by issue #20368
CID 1167595
Diffstat (limited to 'Modules/_tkinter.c')
| -rw-r--r-- | Modules/_tkinter.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index d48fb17..af430fb 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -1397,6 +1397,9 @@ varname_converter(PyObject *in, void *_out) if (PyUnicode_Check(in)) { Py_ssize_t size; s = PyUnicode_AsUTF8AndSize(in, &size); + if (s == NULL) { + return 0; + } if (size > INT_MAX) { PyErr_SetString(PyExc_OverflowError, "string is too long"); return 0; |