Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix some leaks - Neal Norwitz

This commit is contained in:
Jesus Cea 2008-09-03 17:50:59 +00:00
parent 8951b6172c
commit a786f2b498
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_bsddb.c
View File

@ -1106,7 +1106,7 @@ DBEnv_dealloc(DBEnvObject* self)
{ {
PyObject *dummy; PyObject *dummy;
if (self->db_env && !self->closed) { if (self->db_env) {
dummy=DBEnv_close_internal(self,0); dummy=DBEnv_close_internal(self,0);
Py_XDECREF(dummy); Py_XDECREF(dummy);
} }
@ -3981,13 +3981,15 @@ DBEnv_close_internal(DBEnvObject* self, int flags)
dummy=DB_close_internal(self->children_dbs,0); dummy=DB_close_internal(self->children_dbs,0);
Py_XDECREF(dummy); Py_XDECREF(dummy);
} }
}
self->closed = 1;
if (self->db_env) {
MYDB_BEGIN_ALLOW_THREADS; MYDB_BEGIN_ALLOW_THREADS;
err = self->db_env->close(self->db_env, flags); err = self->db_env->close(self->db_env, flags);
MYDB_END_ALLOW_THREADS; MYDB_END_ALLOW_THREADS;
/* after calling DBEnv->close, regardless of error, this DBEnv /* after calling DBEnv->close, regardless of error, this DBEnv
* may not be accessed again (Berkeley DB docs). */ * may not be accessed again (Berkeley DB docs). */
self->closed = 1;
self->db_env = NULL; self->db_env = NULL;
RETURN_IF_ERR(); RETURN_IF_ERR();
} }
@ -6148,7 +6150,7 @@ DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
err = self->sequence->open(self->sequence, txn, &key, flags); err = self->sequence->open(self->sequence, txn, &key, flags);
MYDB_END_ALLOW_THREADS MYDB_END_ALLOW_THREADS
CLEAR_DBT(key); FREE_DBT(key);
RETURN_IF_ERR(); RETURN_IF_ERR();
if (txn) { if (txn) {

2
Modules/bsddb.h
View File

@ -105,7 +105,7 @@
#error "eek! DBVER can't handle minor versions > 9" #error "eek! DBVER can't handle minor versions > 9"
#endif #endif
#define PY_BSDDB_VERSION "4.7.3pre3" #define PY_BSDDB_VERSION "4.7.3pre4"
/* Python object definitions */ /* Python object definitions */