mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 75066 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Benjamin Peterson 2009-10-04 20:40:17 +00:00
parent 0df35a93a2
commit 7e2ef573ed
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_curses.py
View file

@ -259,6 +259,10 @@ def test_resize_term(stdscr):
if curses.LINES != lines - 1 or curses.COLS != cols + 1: if curses.LINES != lines - 1 or curses.COLS != cols + 1:
raise RuntimeError("Expected resizeterm to update LINES and COLS") raise RuntimeError("Expected resizeterm to update LINES and COLS")
def test_issue6243(stdscr):
curses.ungetch(1025)
stdscr.getkey()
def main(stdscr): def main(stdscr):
curses.savetty() curses.savetty()
try: try:
@ -266,6 +270,7 @@ def main(stdscr):
window_funcs(stdscr) window_funcs(stdscr)
test_userptr_without_set(stdscr) test_userptr_without_set(stdscr)
test_resize_term(stdscr) test_resize_term(stdscr)
test_issue6243(stdscr)
finally: finally:
curses.resetty() curses.resetty()

11
Modules/_cursesmodule.c
View file

@ -890,14 +890,17 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
/* getch() returns ERR in nodelay mode */ /* getch() returns ERR in nodelay mode */
PyErr_SetString(PyCursesError, "no input"); PyErr_SetString(PyCursesError, "no input");
return NULL; return NULL;
} else if (rtn<=255) } else if (rtn<=255) {
return Py_BuildValue("C", rtn); return Py_BuildValue("C", rtn);
else } else {
const char *knp;
#if defined(__NetBSD__) #if defined(__NetBSD__)
return PyUnicode_FromString(unctrl(rtn)); knp = unctrl(rtn);
#else #else
return PyUnicode_FromString((const char *)keyname(rtn)); knp = keyname(rtn);
#endif #endif
return PyUnicode_FromString((knp == NULL) ? "" : knp);
}
} }
static PyObject * static PyObject *