Skip to content

[2.7] bpo-25943: Fix potential heap corruption in bsddb's _db_associateCallback() #8337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Jul 21, 2018
Merged

[2.7] bpo-25943: Fix potential heap corruption in bsddb's _db_associateCallback() #8337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Lib/bsddb/test/test_associate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,22 @@ def f(a,b): return a+b
dupDB.close()
self.fail("DBError exception was expected")

@unittest.skipUnless(db.version() >= (4, 6), 'Needs 4.6+')
def test_associateListError(self):
db1 = db.DB(self.env)
db1.open('bad.db', "a.db", db.DB_BTREE, db.DB_CREATE)
db2 = db.DB(self.env)
db2.open('bad.db', "b.db", db.DB_BTREE, db.DB_CREATE)

db1.associate(db2, lambda a, b: [0])

msg = "TypeError: The list returned by DB->associate callback" \
" should be a list of strings."
with test_support.captured_output("stderr") as s:
db1.put("0", "1")
db1.close()
db2.close()
self.assertEquals(s.getvalue().strip(), msg)


#----------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-07-18-23-40-32.bpo-25943.Zgf99y.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix potential heap corruption in the :mod:`bsddb` module. Patch by Zackery
Spytz.
93 changes: 54 additions & 39 deletions Modules/_bsddb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,56 +1503,71 @@ _db_associateCallback(DB* db, const DBT* priKey, const DBT* priData,
else if (PyList_Check(result))
{
char* data;
Py_ssize_t size;
int i, listlen;
Py_ssize_t size, listlen, i;
DBT* dbts;

listlen = PyList_Size(result);

dbts = (DBT *)malloc(sizeof(DBT) * listlen);

for (i=0; i<listlen; i++)
{
if (!PyBytes_Check(PyList_GetItem(result, i)))
{
PyErr_SetString(
PyExc_TypeError,
if (listlen > PY_SIZE_MAX / sizeof(DBT)) {
PyErr_NoMemory();
PyErr_Print();
}
else {
dbts = (DBT *)malloc(sizeof(DBT) * listlen);
if (dbts == NULL) {
PyErr_NoMemory();
PyErr_Print();
}
else {
for (i = 0; i < listlen; i++) {
if (!PyBytes_Check(PyList_GetItem(result, i))) {
PyErr_SetString(PyExc_TypeError,
#if (PY_VERSION_HEX < 0x03000000)
"The list returned by DB->associate callback should be a list of strings.");
#else
"The list returned by DB->associate callback should be a list of bytes.");
#endif
PyErr_Print();
}

PyBytes_AsStringAndSize(
PyList_GetItem(result, i),
&data, &size);

CLEAR_DBT(dbts[i]);
dbts[i].data = malloc(size); /* TODO, check this */

if (dbts[i].data)
{
memcpy(dbts[i].data, data, size);
dbts[i].size = size;
dbts[i].ulen = dbts[i].size;
dbts[i].flags = DB_DBT_APPMALLOC; /* DB will free */
}
else
{
PyErr_SetString(PyExc_MemoryError,
"malloc failed in _db_associateCallback (list)");
PyErr_Print();
break;
}

if (PyBytes_AsStringAndSize(PyList_GetItem(result, i),
&data, &size) < 0) {
break;
}

CLEAR_DBT(dbts[i]);
dbts[i].data = malloc(size);
if (dbts[i].data) {
memcpy(dbts[i].data, data, size);
dbts[i].size = size;
dbts[i].ulen = dbts[i].size;
/* DB will free. */
dbts[i].flags = DB_DBT_APPMALLOC;
}
else {
PyErr_SetString(PyExc_MemoryError,
"malloc failed in "
"_db_associateCallback (list)");
break;
}
}
if (PyErr_Occurred()) {
PyErr_Print();
while (i--) {
free(dbts[i].data);
}
free(dbts);
}
else {
CLEAR_DBT(*secKey);

secKey->data = dbts;
secKey->size = listlen;
secKey->flags = DB_DBT_APPMALLOC | DB_DBT_MULTIPLE;
retval = 0;
}
}
}

CLEAR_DBT(*secKey);

secKey->data = dbts;
secKey->size = listlen;
secKey->flags = DB_DBT_APPMALLOC | DB_DBT_MULTIPLE;
retval = 0;
}
#endif
else {
Expand Down