diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2010-02-22 17:06:22 +0000 |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2010-02-22 17:06:22 +0000 |
| commit | 47d960ec4a50b0f77fc49f05e3f133225370524e (patch) | |
| tree | 86c9a0fbdd7f362aec65a5db31ca5c53049eb404 /Modules/_cursesmodule.c | |
| parent | 63553d1829ddd5987706a6f6079a9e2093f23b7e (diff) | |
| download | cpython-git-47d960ec4a50b0f77fc49f05e3f133225370524e.tar.gz | |
Merged revisions 75066 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75066 | andrew.kuchling | 2009-09-25 18:23:54 -0400 (Fri, 25 Sep 2009) | 4 lines
#6243: fix segfault when keyname() returns a NULL pointer.
Bug noted by Trundle, patched by Trundle and Jerry Chen.
........
Diffstat (limited to 'Modules/_cursesmodule.c')
| -rw-r--r-- | Modules/_cursesmodule.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 4a77b0552a..e2c17e1c18 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -882,14 +882,17 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args) /* getch() returns ERR in nodelay mode */ PyErr_SetString(PyCursesError, "no input"); return NULL; - } else if (rtn<=255) + } else if (rtn<=255) { return Py_BuildValue("c", rtn); - else + } else { + const char *knp; #if defined(__NetBSD__) - return PyString_FromString(unctrl(rtn)); + knp = unctrl(rtn); #else - return PyString_FromString((char *)keyname(rtn)); + knp = keyname(rtn); #endif + return PyString_FromString((knp == NULL) ? "" : knp); + } } static PyObject * |