Kaydet (Commit) 692ca9a0 authored tarafından Gregory P. Smith's avatar Gregory P. Smith

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.
üst 48796c32
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment