mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

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

Browse source 
(cherry picked from commit 4f469c0966)
This commit is contained in:
Miss Islington (bot) 2017-11-01 12:23:46 -07:00 • committed by Serhiy Storchaka
parent 1f81ea85e8
commit aad7ac10af
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Modules/_cursesmodule.c
View file

@ -912,12 +912,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);
@ -2285,24 +2292,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
@ -2701,14 +2714,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