Bug #1400115, Fix segfault when calling curses.panel.userptr()
without prior setting of the userptr.
Will backport.
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index e137d31..6f843ad 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -9,6 +9,7 @@
#
import curses, sys, tempfile, os
+import curses.panel
# Optionally test curses module. This currently requires that the
# 'curses' resource be given on the regrtest command line using the -u
@@ -213,12 +214,22 @@
print 'curses.unctrl fails on character', repr(ch)
+def test_userptr_without_set(stdscr):
+ w = curses.newwin(10, 10)
+ p = curses.panel.new_panel(w)
+ # try to access userptr() before calling set_userptr() -- segfaults
+ try:
+ p.userptr()
+ raise RuntimeError, 'userptr should fail since not set'
+ except curses.panel.error:
+ pass
def main(stdscr):
curses.savetty()
try:
module_funcs(stdscr)
window_funcs(stdscr)
+ test_userptr_without_set(stdscr)
finally:
curses.resetty()
diff --git a/Misc/NEWS b/Misc/NEWS
index 3860fd3..2065ede 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -209,6 +209,9 @@
Extension Modules
-----------------
+- Bug #1400115, Fix segfault when calling curses.panel.userptr()
+ without prior setting of the userptr.
+
- Fix 64-bit problems in bsddb.
- Patch #1365916: fix some unsafe 64-bit mmap methods.
diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 08c5f09..b5f30cb 100644
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -299,6 +299,11 @@
PyObject *obj;
PyCursesInitialised;
obj = (PyObject *) panel_userptr(self->pan);
+ if (obj == NULL) {
+ PyErr_SetString(PyCursesError, "no userptr set");
+ return NULL;
+ }
+
Py_INCREF(obj);
return obj;
}