summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-08-14 01:21:16 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-08-14 01:21:16 (GMT)
commitf17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec (patch)
treefa22d3d0a142786587fdfd0ccd5d871b3809f333 /Modules
parent9745ee0b444c92a23a1b8851f789044baa64dba5 (diff)
parent40a77c33819606b40ca04f680a06fcf31e2151a6 (diff)
downloadcpython-f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec.zip
cpython-f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec.tar.gz
cpython-f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec.tar.bz2
merge 3.4
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_cursesmodule.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index d64bdc7..06aa46c 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1221,6 +1221,10 @@ PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
case 1:
if (!PyArg_ParseTuple(args,"i;n", &n))
return NULL;
+ if (n < 0) {
+ PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
+ return NULL;
+ }
Py_BEGIN_ALLOW_THREADS
rtn2 = wgetnstr(self->win, rtn, Py_MIN(n, 1023));
Py_END_ALLOW_THREADS
@@ -1239,6 +1243,10 @@ PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
case 3:
if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n))
return NULL;
+ if (n < 0) {
+ PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
+ return NULL;
+ }
#ifdef STRICT_SYSV_CURSES
Py_BEGIN_ALLOW_THREADS
rtn2 = wmove(self->win,y,x)==ERR ? ERR :