summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-11-21 05:26:22 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-11-21 05:26:22 (GMT)
commit4fe442383d140dbdee28102f8854a7db14370bcb (patch)
tree89b6ae7462517d8fa35a06bd2adb7094a8f28a3e /Lib
parent5dba6f74c60391d2933830f82f3fa8ee0a5d241c (diff)
downloadcpython-4fe442383d140dbdee28102f8854a7db14370bcb.zip
cpython-4fe442383d140dbdee28102f8854a7db14370bcb.tar.gz
cpython-4fe442383d140dbdee28102f8854a7db14370bcb.tar.bz2
Bug #1599782: Fix segfault on bsddb.db.DB().type().
The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/bsddb/test/test_dbobj.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/bsddb/test/test_dbobj.py b/Lib/bsddb/test/test_dbobj.py
index 6799fc9..af494e1 100644
--- a/Lib/bsddb/test/test_dbobj.py
+++ b/Lib/bsddb/test/test_dbobj.py
@@ -69,6 +69,10 @@ class dbobjTestCase(unittest.TestCase):
self.db.close()
self.env.close()
+ def test03_dbobj_type_before_open(self):
+ # Ensure this doesn't cause a segfault.
+ self.assertRaises(db.DBInvalidArgError, db.DB().type)
+
#----------------------------------------------------------------------
def test_suite():