Bugfix for issue3885 and 'DB.verify()' crash.
Reviewed by Nick Coghlan.
diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py
index b9e942b..52de869 100644
--- a/Lib/bsddb/test/test_basics.py
+++ b/Lib/bsddb/test/test_basics.py
@@ -573,6 +573,15 @@
#----------------------------------------
+ def test07_verify(self):
+ # Verify bug solved in 4.7.3pre8
+ self.d.close()
+ d = db.DB(self.env)
+ d.verify(self.filename)
+
+
+ #----------------------------------------
+
#----------------------------------------------------------------------
@@ -602,13 +611,13 @@
#----------------------------------------
- def test07_EnvRemoveAndRename(self):
+ def test08_EnvRemoveAndRename(self):
if not self.env:
return
if verbose:
print '\n', '-=' * 30
- print "Running %s.test07_EnvRemoveAndRename..." % self.__class__.__name__
+ print "Running %s.test08_EnvRemoveAndRename..." % self.__class__.__name__
# can't rename or remove an open DB
self.d.close()
@@ -619,7 +628,7 @@
# dbremove and dbrename are in 4.1 and later
if db.version() < (4,1):
- del test07_EnvRemoveAndRename
+ del test08_EnvRemoveAndRename
#----------------------------------------
@@ -720,11 +729,11 @@
#----------------------------------------
- def test07_TxnTruncate(self):
+ def test08_TxnTruncate(self):
d = self.d
if verbose:
print '\n', '-=' * 30
- print "Running %s.test07_TxnTruncate..." % self.__class__.__name__
+ print "Running %s.test08_TxnTruncate..." % self.__class__.__name__
d.put("abcde", "ABCDE");
txn = self.env.txn_begin()
@@ -737,7 +746,7 @@
#----------------------------------------
- def test08_TxnLateUse(self):
+ def test09_TxnLateUse(self):
txn = self.env.txn_begin()
txn.abort()
try:
@@ -771,11 +780,11 @@
dbtype = db.DB_BTREE
dbsetflags = db.DB_RECNUM
- def test07_RecnoInBTree(self):
+ def test08_RecnoInBTree(self):
d = self.d
if verbose:
print '\n', '-=' * 30
- print "Running %s.test07_RecnoInBTree..." % self.__class__.__name__
+ print "Running %s.test08_RecnoInBTree..." % self.__class__.__name__
rec = d.get(200)
self.assertEqual(type(rec), type(()))
@@ -805,11 +814,11 @@
class BasicDUPTestCase(BasicTestCase):
dbsetflags = db.DB_DUP
- def test08_DuplicateKeys(self):
+ def test09_DuplicateKeys(self):
d = self.d
if verbose:
print '\n', '-=' * 30
- print "Running %s.test08_DuplicateKeys..." % \
+ print "Running %s.test09_DuplicateKeys..." % \
self.__class__.__name__
d.put("dup0", "before")
@@ -878,11 +887,11 @@
else:
return db.DB_BTREE
- def test09_MultiDB(self):
+ def test10_MultiDB(self):
d1 = self.d
if verbose:
print '\n', '-=' * 30
- print "Running %s.test09_MultiDB..." % self.__class__.__name__
+ print "Running %s.test10_MultiDB..." % self.__class__.__name__
d2 = db.DB(self.env)
d2.open(self.filename, "second", self.dbtype,
@@ -1014,9 +1023,20 @@
self.obj = db.DB()
class CrashAndBurn(unittest.TestCase) :
- def test01_OpenCrash(self) :
- # See http://bugs.python.org/issue3307
- self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)
+ import sys
+ if sys.version_info[:3] < (2, 4, 0):
+ def assertTrue(self, expr, msg=None):
+ self.failUnless(expr,msg=msg)
+
+ #def test01_OpenCrash(self) :
+ # # See http://bugs.python.org/issue3307
+ # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)
+
+ def test02_DBEnv_dealloc(self):
+ # http://bugs.python.org/issue3885
+ import gc
+ self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)
+ gc.collect()
#----------------------------------------------------------------------
@@ -1044,7 +1064,7 @@
suite.addTest(unittest.makeSuite(HashMultiDBTestCase))
suite.addTest(unittest.makeSuite(DBEnvPrivateObject))
suite.addTest(unittest.makeSuite(DBPrivateObject))
- #suite.addTest(unittest.makeSuite(CrashAndBurn))
+ suite.addTest(unittest.makeSuite(CrashAndBurn))
return suite
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 9324d76..149e43d 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -989,7 +989,7 @@
/* Forward declaration */
-static PyObject *DB_close_internal(DBObject* self, int flags);
+static PyObject *DB_close_internal(DBObject* self, int flags, int do_not_close);
static void
DB_dealloc(DBObject* self)
@@ -997,8 +997,15 @@
PyObject *dummy;
if (self->db != NULL) {
- dummy=DB_close_internal(self,0);
- Py_XDECREF(dummy);
+ dummy=DB_close_internal(self, 0, 0);
+ /*
+ ** Raising exceptions while doing
+ ** garbage collection is a fatal error.
+ */
+ if (dummy)
+ Py_DECREF(dummy);
+ else
+ PyErr_Clear();
}
if (self->in_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) self);
@@ -1052,8 +1059,15 @@
PyObject *dummy;
if (self->dbc != NULL) {
- dummy=DBC_close_internal(self);
- Py_XDECREF(dummy);
+ dummy=DBC_close_internal(self);
+ /*
+ ** Raising exceptions while doing
+ ** garbage collection is a fatal error.
+ */
+ if (dummy)
+ Py_DECREF(dummy);
+ else
+ PyErr_Clear();
}
if (self->in_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) self);
@@ -1071,6 +1085,7 @@
if (self == NULL)
return NULL;
+ self->db_env = NULL;
self->closed = 1;
self->flags = flags;
self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE;
@@ -1107,8 +1122,15 @@
PyObject *dummy;
if (self->db_env) {
- dummy=DBEnv_close_internal(self,0);
- Py_XDECREF(dummy);
+ dummy=DBEnv_close_internal(self, 0);
+ /*
+ ** Raising exceptions while doing
+ ** garbage collection is a fatal error.
+ */
+ if (dummy)
+ Py_DECREF(dummy);
+ else
+ PyErr_Clear();
}
Py_XDECREF(self->event_notifyCallback);
@@ -1186,8 +1208,17 @@
if (self->txn) {
int flag_prepare = self->flag_prepare;
+
dummy=DBTxn_abort_discard_internal(self,0);
- Py_XDECREF(dummy);
+ /*
+ ** Raising exceptions while doing
+ ** garbage collection is a fatal error.
+ */
+ if (dummy)
+ Py_DECREF(dummy);
+ else
+ PyErr_Clear();
+
if (!flag_prepare) {
PyErr_Warn(PyExc_RuntimeWarning,
"DBTxn aborted in destructor. No prior commit() or abort().");
@@ -1280,7 +1311,14 @@
if (self->sequence != NULL) {
dummy=DBSequence_close_internal(self,0,0);
- Py_XDECREF(dummy);
+ /*
+ ** Raising exceptions while doing
+ ** garbage collection is a fatal error.
+ */
+ if (dummy)
+ Py_DECREF(dummy);
+ else
+ PyErr_Clear();
}
if (self->in_weakreflist != NULL) {
@@ -1485,10 +1523,10 @@
static PyObject*
-DB_close_internal(DBObject* self, int flags)
+DB_close_internal(DBObject* self, int flags, int do_not_close)
{
PyObject *dummy;
- int err;
+ int err = 0;
if (self->db != NULL) {
/* Can be NULL if db is not in an environment */
@@ -1511,10 +1549,20 @@
}
#endif
- MYDB_BEGIN_ALLOW_THREADS;
- err = self->db->close(self->db, flags);
- MYDB_END_ALLOW_THREADS;
- self->db = NULL;
+ /*
+ ** "do_not_close" is used to dispose all related objects in the
+ ** tree, without actually releasing the "root" object.
+ ** This is done, for example, because function calls like
+ ** "DB.verify()" implicitly close the underlying handle. So
+ ** the handle doesn't need to be closed, but related objects
+ ** must be cleaned up.
+ */
+ if (!do_not_close) {
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->db->close(self->db, flags);
+ MYDB_END_ALLOW_THREADS;
+ self->db = NULL;
+ }
RETURN_IF_ERR();
}
RETURN_NONE();
@@ -1526,7 +1574,7 @@
int flags=0;
if (!PyArg_ParseTuple(args,"|i:close", &flags))
return NULL;
- return DB_close_internal(self,flags);
+ return DB_close_internal(self, flags, 0);
}
@@ -2146,7 +2194,7 @@
if (makeDBError(err)) {
PyObject *dummy;
- dummy=DB_close_internal(self,0);
+ dummy=DB_close_internal(self, 0, 0);
Py_XDECREF(dummy);
return NULL;
}
@@ -2840,21 +2888,24 @@
/* XXX(nnorwitz): it should probably be an exception if outFile
can't be opened. */
- MYDB_BEGIN_ALLOW_THREADS;
- err = self->db->verify(self->db, fileName, dbName, outFile, flags);
- MYDB_END_ALLOW_THREADS;
- if (outFile)
- fclose(outFile);
-
{ /* DB.verify acts as a DB handle destructor (like close) */
PyObject *error;
- error=DB_close_internal(self,0);
+ error=DB_close_internal(self, 0, 1);
if (error ) {
return error;
}
}
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->db->verify(self->db, fileName, dbName, outFile, flags);
+ MYDB_END_ALLOW_THREADS;
+
+ self->db = NULL; /* Implicit close; related objects already released */
+
+ if (outFile)
+ fclose(outFile);
+
RETURN_IF_ERR();
RETURN_NONE();
}
@@ -3978,7 +4029,7 @@
Py_XDECREF(dummy);
}
while(self->children_dbs) {
- dummy=DB_close_internal(self->children_dbs,0);
+ dummy=DB_close_internal(self->children_dbs, 0, 0);
Py_XDECREF(dummy);
}
}
@@ -4003,7 +4054,7 @@
if (!PyArg_ParseTuple(args, "|i:close", &flags))
return NULL;
- return DBEnv_close_internal(self,flags);
+ return DBEnv_close_internal(self, flags);
}
@@ -5949,7 +6000,7 @@
}
#endif
while (self->children_dbs) {
- dummy=DB_close_internal(self->children_dbs,0);
+ dummy=DB_close_internal(self->children_dbs, 0, 0);
Py_XDECREF(dummy);
}
@@ -6030,6 +6081,14 @@
self->txn=NULL;
}
+ /*
+ ** "do_not_close" is used to dispose all related objects in the
+ ** tree, without actually releasing the "root" object.
+ ** This is done, for example, because function calls like
+ ** "DBSequence.remove()" implicitly close the underlying handle. So
+ ** the handle doesn't need to be closed, but related objects
+ ** must be cleaned up.
+ */
if (!do_not_close) {
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->close(self->sequence, flags);
diff --git a/Modules/bsddb.h b/Modules/bsddb.h
index f796681..fe7d823 100644
--- a/Modules/bsddb.h
+++ b/Modules/bsddb.h
@@ -105,7 +105,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
-#define PY_BSDDB_VERSION "4.7.3pre5"
+#define PY_BSDDB_VERSION "4.7.3pre9"
/* Python object definitions */