From 692ca9a0cbd32141fdc674ec2707b5893a8503b7 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 6 Jun 2005 09:55:06 +0000 Subject: fixes pybsddb SF bug id 1215432. DB.associate() would crash when a DBError was supposed to be raised. needs backport to 2.4.x and possibly 2.3.x. --- Modules/_bsddb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index 3858e26..12bb768 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -1181,9 +1181,7 @@ DB_associate(DBObject* self, PyObject* args, PyObject* kwargs) } /* Save a reference to the callback in the secondary DB. */ - if (self->associateCallback != NULL) { - Py_DECREF(self->associateCallback); - } + Py_XDECREF(secondaryDB->associateCallback); Py_INCREF(callback); secondaryDB->associateCallback = callback; secondaryDB->primaryDBType = _DB_get_type(self); @@ -1217,8 +1215,8 @@ DB_associate(DBObject* self, PyObject* args, PyObject* kwargs) MYDB_END_ALLOW_THREADS; if (err) { - Py_DECREF(self->associateCallback); - self->associateCallback = NULL; + Py_XDECREF(secondaryDB->associateCallback); + secondaryDB->associateCallback = NULL; secondaryDB->primaryDBType = 0; } -- cgit v0.12