From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 4 Oct 2009 20:41:56 +0000 (+0000)
Subject: Merged revisions 75248 via svnmerge from
X-Git-Tag: v3.1.2rc1~459
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf0770dd82b8629af60cb3c16d75a436788f2eca;p=python

Merged revisions 75248 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75248 | benjamin.peterson | 2009-10-04 15:40:17 -0500 (Sun, 04 Oct 2009) | 11 lines

  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/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 4be2029fab..2615ffb1cb 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -259,6 +259,10 @@ def test_resize_term(stdscr):
         if curses.LINES != lines - 1 or curses.COLS != cols + 1:
             raise RuntimeError("Expected resizeterm to update LINES and COLS")
 
+def test_issue6243(stdscr):
+    curses.ungetch(1025)
+    stdscr.getkey()
+
 def main(stdscr):
     curses.savetty()
     try:
@@ -266,6 +270,7 @@ def main(stdscr):
         window_funcs(stdscr)
         test_userptr_without_set(stdscr)
         test_resize_term(stdscr)
+        test_issue6243(stdscr)
     finally:
         curses.resetty()
 
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index c7d377859d..da19216bef 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -890,14 +890,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 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 *