1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 3.5

Browse Source
This commit is contained in:
Benjamin Peterson 2016-08-13 18:21:32 -07:00
commit c0654d4e60
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_curses.py
View File

@ -188,6 +188,9 @@ class TestCurses(unittest.TestCase):
if hasattr(curses, 'enclose'): if hasattr(curses, 'enclose'):
stdscr.enclose() stdscr.enclose()
self.assertRaises(ValueError, stdscr.getstr, -400)
self.assertRaises(ValueError, stdscr.getstr, 2, 3, -400)
def test_module_funcs(self): def test_module_funcs(self):
"Test module-level functions" "Test module-level functions"

3
Misc/NEWS
View File

@ -58,6 +58,9 @@ Library
- Issue #27661: Added tzinfo keyword argument to datetime.combine. - Issue #27661: Added tzinfo keyword argument to datetime.combine.
- In the curses module, raise an error if window.getstr() is passed a negative
value.
- Issue #27758: Fix possible integer overflow in the _csv module for large record - Issue #27758: Fix possible integer overflow in the _csv module for large record
lengths. lengths.

8
Modules/_cursesmodule.c
View File

@ -1221,6 +1221,10 @@ PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
case 1: case 1:
if (!PyArg_ParseTuple(args,"i;n", &n)) if (!PyArg_ParseTuple(args,"i;n", &n))
return NULL; return NULL;
if (n < 0) {
PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
return NULL;
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rtn2 = wgetnstr(self->win, rtn, Py_MIN(n, 1023)); rtn2 = wgetnstr(self->win, rtn, Py_MIN(n, 1023));
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
@ -1239,6 +1243,10 @@ PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
case 3: case 3:
if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n)) if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n))
return NULL; return NULL;
if (n < 0) {
PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
return NULL;
}
#ifdef STRICT_SYSV_CURSES #ifdef STRICT_SYSV_CURSES
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rtn2 = wmove(self->win,y,x)==ERR ? ERR : rtn2 = wmove(self->win,y,x)==ERR ? ERR :