Protect against core dumps in gdbm: don't allow access by key once the
database is closed. Raise gdbm.error instead.
Bug report #198 submitted by Barry Haddow <bhaddow@orbism.com>.
diff --git a/Modules/gdbmmodule.c b/Modules/gdbmmodule.c
index 0df7df2..31855f5 100644
--- a/Modules/gdbmmodule.c
+++ b/Modules/gdbmmodule.c
@@ -155,7 +155,12 @@
if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
return NULL;
-
+
+ if (dp->di_dbm == NULL) {
+ PyErr_SetString(DbmError,
+ "GDBM object has already been closed");
+ return NULL;
+ }
drec = gdbm_fetch(dp->di_dbm, krec);
if ( drec.dptr == 0 ) {
PyErr_SetString(PyExc_KeyError,
@@ -180,7 +185,8 @@
return -1;
}
if (dp->di_dbm == NULL) {
- PyErr_SetString(DbmError, "GDBM object has already been closed");
+ PyErr_SetString(DbmError,
+ "GDBM object has already been closed");
return -1;
}
dp->di_size = -1;