commit b49e53ee16eba81fb9548843d24d1cc328f2095a
author Andrew M. Kuchling <amk@amk.ca> Fri Sep 25 22:23:54 2009 +0000
committer Andrew M. Kuchling <amk@amk.ca> Fri Sep 25 22:23:54 2009 +0000
tree a507805bd930a95bf0798bc6de3d9441f3414179
parent a9a7611fb6b1a69d0ab9474da2b9cf9e8b294b54

#6243: fix segfault when keyname() returns a NULL pointer.

Bug noted by Trundle, patched by Trundle and Jerry Chen.

Modules/_cursesmodule.c

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index cd143a4..53fa432 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -882,14 +882,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 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 *