mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 12:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix a double free when positioning a database cursor to a non-existant

Browse source 
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
This commit is contained in:
Gregory P. Smith 2007-10-09 06:50:43 +00:00
parent 392505391e
commit 10bed54ae2
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_bsddb.c
View file

@ -328,7 +328,19 @@ make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags)
return 0;
}
key->data = PyString_AS_STRING(keyobj);
/*
* NOTE(gps): I don't like doing a data copy here, it seems
* wasteful. But without a clean way to tell FREE_DBT if it
* should free key->data or not we have to. Other places in
* the code check for DB_THREAD and forceably set DBT_MALLOC
* when we otherwise would leave flags 0 to indicate that.
*/
key->data = strdup(PyString_AS_STRING(keyobj));
if (key->data == NULL) {
PyErr_SetString(PyExc_MemoryError, "Key memory allocation failed");
return 0;
}
key->flags = DB_DBT_REALLOC;
key->size = PyString_GET_SIZE(keyobj);
}