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.
........
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index cdb90db..4439fcd 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -261,6 +261,10 @@
         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:
@@ -268,6 +272,7 @@
         window_funcs(stdscr)
         test_userptr_without_set(stdscr)
         test_resize_term(stdscr)
+        test_issue6243(stdscr)
     finally:
         curses.resetty()