summaryrefslogtreecommitdiffstats
path: root/Modules
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 /Modules
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 'Modules')
-rw-r--r--Modules/_bsddb.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 9be5c6a..e6046e7 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -1779,9 +1779,7 @@ DB_get_type(DBObject* self, PyObject* args)
return NULL;
CHECK_DB_NOT_CLOSED(self);
- MYDB_BEGIN_ALLOW_THREADS;
type = _DB_get_type(self);
- MYDB_END_ALLOW_THREADS;
if (type == -1)
return NULL;
return PyInt_FromLong(type);