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

fix leaks in keys(); fix bug in close()

Browse source
This commit is contained in:
Guido van Rossum 1995-08-28 02:58:00 +00:00
parent 05870115fc
commit 66017aa1b8
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/gdbmmodule.c
View file

@ -177,7 +177,6 @@ dbm_close(dp, args)
if ( dp->di_dbm ) if ( dp->di_dbm )
gdbm_close(dp->di_dbm); gdbm_close(dp->di_dbm);
dp->di_dbm = NULL; dp->di_dbm = NULL;
DEL(dp);
INCREF(None); INCREF(None);
return None; return None;
} }
@ -189,6 +188,7 @@ dbm_keys(dp, args)
{ {
register object *v, *item; register object *v, *item;
datum key, okey={ (char *)NULL, 0}; datum key, okey={ (char *)NULL, 0};
int err;
if (dp == NULL || !is_dbmobject(dp)) { if (dp == NULL || !is_dbmobject(dp)) {
err_badcall(); err_badcall();
@ -202,10 +202,17 @@ dbm_keys(dp, args)
for (key = gdbm_firstkey(dp->di_dbm); key.dptr; for (key = gdbm_firstkey(dp->di_dbm); key.dptr;
key = gdbm_nextkey(dp->di_dbm,okey) ) { key = gdbm_nextkey(dp->di_dbm,okey) ) {
item = newsizedstringobject(key.dptr, key.dsize); item = newsizedstringobject(key.dptr, key.dsize);
if ( item == 0 ) if (item == 0) {
DECREF(v);
return NULL; return NULL;
addlistitem(v, item); }
err = addlistitem(v, item);
DECREF(item);
if(okey.dsize) free(okey.dptr); if(okey.dsize) free(okey.dptr);
if (err != 0) {
DECREF(v);
return NULL;
}
okey=key; okey=key;
} }
return v; return v;