Merged revisions 75066 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75066 | andrew.kuchling | 2009-09-25 17:23:54 -0500 (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.
........
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index c7d3778..da19216 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -890,14 +890,17 @@
/* 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 PyUnicode_FromString(unctrl(rtn));
+ knp = unctrl(rtn);
#else
- return PyUnicode_FromString((const char *)keyname(rtn));
+ knp = keyname(rtn);
#endif
+ return PyUnicode_FromString((knp == NULL) ? "" : knp);
+ }
}
static PyObject *