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

Handle malloc and fopen failures more gracefully. 

Klocwork 180-181
This commit is contained in:
Neal Norwitz 2006-08-13 18:11:43 +00:00
parent e9ac0bb169
commit 5aa96895d8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/_bsddb.c
View File

@ -1797,7 +1797,6 @@ DB_join(DBObject* self, PyObject* args)
DBC** cursors; DBC** cursors;
DBC* dbc; DBC* dbc;
if (!PyArg_ParseTuple(args,"O|i:join", &cursorsObj, &flags)) if (!PyArg_ParseTuple(args,"O|i:join", &cursorsObj, &flags))
return NULL; return NULL;
@ -1811,6 +1810,11 @@ DB_join(DBObject* self, PyObject* args)
length = PyObject_Length(cursorsObj); length = PyObject_Length(cursorsObj);
cursors = malloc((length+1) * sizeof(DBC*)); cursors = malloc((length+1) * sizeof(DBC*));
if (!cursors) {
PyErr_NoMemory();
return NULL;
}
cursors[length] = NULL; cursors[length] = NULL;
for (x=0; x<length; x++) { for (x=0; x<length; x++) {
PyObject* item = PySequence_GetItem(cursorsObj, x); PyObject* item = PySequence_GetItem(cursorsObj, x);
@ -2622,11 +2626,13 @@ DB_verify(DBObject* self, PyObject* args, PyObject* kwargs)
CHECK_DB_NOT_CLOSED(self); CHECK_DB_NOT_CLOSED(self);
if (outFileName) if (outFileName)
outFile = fopen(outFileName, "w"); outFile = fopen(outFileName, "w");
/* XXX(nnorwitz): it should probably be an exception if outFile
can't be opened. */
MYDB_BEGIN_ALLOW_THREADS; MYDB_BEGIN_ALLOW_THREADS;
err = self->db->verify(self->db, fileName, dbName, outFile, flags); err = self->db->verify(self->db, fileName, dbName, outFile, flags);
MYDB_END_ALLOW_THREADS; MYDB_END_ALLOW_THREADS;
if (outFileName) if (outFile)
fclose(outFile); fclose(outFile);
/* DB.verify acts as a DB handle destructor (like close); this was /* DB.verify acts as a DB handle destructor (like close); this was