traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-27666: Fixed stack corruption in curses.box() and curses.ungetmouse(). (GH-4220) (#4222) 

(cherry picked from commit 4f469c0966)
This commit is contained in:
Miss Islington (bot) 2017-11-01 12:24:00 -07:00 committed by Serhiy Storchaka
parent ce51890894
commit b694770a2b
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_curses.py
View File

@ -92,7 +92,7 @@ class TestCurses(unittest.TestCase):
(4,4, 'a'), (5,5, 'a', curses.A_BOLD)]:
meth(*args)
for meth in [stdscr.box, stdscr.clear, stdscr.clrtobot,
for meth in [stdscr.clear, stdscr.clrtobot,
stdscr.clrtoeol, stdscr.cursyncup, stdscr.delch,
stdscr.deleteln, stdscr.erase, stdscr.getbegyx,
stdscr.getbkgd, stdscr.getkey, stdscr.getmaxyx,
@ -125,6 +125,13 @@ class TestCurses(unittest.TestCase):
win.border(65, 66, 67, 68,
69, [], 71, 72)
win.box(65, 67)
win.box('!', '_')
win.box(b':', b'~')
self.assertRaises(TypeError, win.box, 65, 66, 67)
self.assertRaises(TypeError, win.box, 65)
win.box()
stdscr.clearok(1)
win4 = stdscr.derwin(2,2)

3
Misc/NEWS.d/next/Library/2017-11-01-18-13-42.bpo-27666.j2zRnF.rst Normal file
View File

@ -0,0 +1,3 @@
Fixed stack corruption in curses.box() and curses.ungetmouse() when the size
of types chtype or mmask_t is less than the size of C long. curses.box()
now accepts characters as arguments. Based on patch by Steve Fink.

38
Modules/_cursesmodule.c
View File

@ -639,12 +639,19 @@ PyCursesWindow_Border(PyCursesWindowObject *self, PyObject *args)
static PyObject *
PyCursesWindow_Box(PyCursesWindowObject *self, PyObject *args)
{
PyObject *temp1, *temp2;
chtype ch1=0,ch2=0;
switch(PyTuple_Size(args)){
case 0: break;
default:
if (!PyArg_ParseTuple(args,"ll;vertint,horint", &ch1, &ch2))
if (!PyArg_ParseTuple(args,"OO;verch,horch", &temp1, &temp2))
return NULL;
if (!PyCurses_ConvertToChtype(self, temp1, &ch1)) {
return NULL;
}
if (!PyCurses_ConvertToChtype(self, temp2, &ch2)) {
return NULL;
}
}
box(self->win,ch1,ch2);
Py_INCREF(Py_None);
@ -1826,24 +1833,30 @@ PyCurses_GetMouse(PyObject *self)
PyErr_SetString(PyCursesError, "getmouse() returned ERR");
return NULL;
}
return Py_BuildValue("(hiiil)",
return Py_BuildValue("(hiiik)",
(short)event.id,
event.x, event.y, event.z,
(long) event.bstate);
(int)event.x, (int)event.y, (int)event.z,
(unsigned long) event.bstate);
}
static PyObject *
PyCurses_UngetMouse(PyObject *self, PyObject *args)
{
MEVENT event;
short id;
int x, y, z;
unsigned long bstate;
PyCursesInitialised;
if (!PyArg_ParseTuple(args, "hiiil",
&event.id,
&event.x, &event.y, &event.z,
(int *) &event.bstate))
if (!PyArg_ParseTuple(args, "hiiik",
&id, &x, &y, &z, &bstate))
return NULL;
event.id = id;
event.x = x;
event.y = y;
event.z = z;
event.bstate = bstate;
return PyCursesCheckERR(ungetmouse(&event), "ungetmouse");
}
#endif
@ -2200,14 +2213,15 @@ PyCurses_MouseInterval(PyObject *self, PyObject *args)
static PyObject *
PyCurses_MouseMask(PyObject *self, PyObject *args)
{
int newmask;
unsigned long newmask;
mmask_t oldmask, availmask;
PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i;mousemask",&newmask))
if (!PyArg_ParseTuple(args,"k;mousemask",&newmask))
return NULL;
availmask = mousemask(newmask, &oldmask);
return Py_BuildValue("(ll)", (long)availmask, (long)oldmask);
availmask = mousemask((mmask_t)newmask, &oldmask);
return Py_BuildValue("(kk)",
(unsigned long)availmask, (unsigned long)oldmask);
}
#endif