From d33491ea76b3898d5fd0fe3ae75e73ea157a7186 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 5 Feb 2014 00:29:17 +0100 Subject: Issue #20515: Fix NULL pointer dereference introduced by issue #20368 CID 1167595 --- Misc/NEWS | 2 ++ Modules/_tkinter.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 045be47..85321dd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,8 @@ Core and Builtins Library ------- +- Issue #20515: Fix NULL pointer dereference introduced by issue #20368. + - Issue #19186: Restore namespacing of expat symbols inside the pyexpat module. - Issue #20426: When passing the re.DEBUG flag, re.compile() displays the diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index b106b4b..262d679 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -1568,6 +1568,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; -- cgit v0.12