greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed memory leaks and pointer aliasing bugs in lsmTree_iterator.

Browse source
This commit is contained in:
Sears Russell 2008-12-05 00:08:46 +00:00
parent 32fae6795b
commit 32950b2b98
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/stasis/operations/lsmTree.c
View file

@ -846,7 +846,7 @@ lladdIterator_t* lsmTreeIterator_openAt(int xid, recordid root, const byte* key)
impl->current.slot = lsm_entry_rid.slot - 1; // slot before thing of interest
impl->current.size = lsm_entry_rid.size;
impl->t = 0; // value doesn't matter; will be overwritten by next()
impl->t = 0; // must be zero so free() doesn't croak.
impl->justOnePage = (depth==0);
lladdIterator_t *it = malloc(sizeof(lladdIterator_t));
@ -866,7 +866,12 @@ lladdIterator_t *lsmTreeIterator_copy(int xid, lladdIterator_t* i) {
mine->p = 0;
}
memcpy(&mine->current, &it->current,sizeof(recordid));
mine->t = it->t;
if(it->t) {
mine->t = malloc(sizeof(*it->t) + it->current.size);
memcpy(mine->t, it->t, sizeof(*it->t) + it->current.size);
} else {
mine->t = 0;
}
mine->justOnePage = it->justOnePage;
lladdIterator_t * ret = malloc(sizeof(lladdIterator_t));
ret->type = -1; // XXX LSM_TREE_ITERATOR
@ -879,6 +884,7 @@ void lsmTreeIterator_close(int xid, lladdIterator_t *it) {
unlock(impl->p->rwlatch);
releasePage(impl->p);
}
if(impl->t) { free(impl->t); }
free(impl);
free(it);
}
@ -911,11 +917,12 @@ int lsmTreeIterator_next(int xid, lladdIterator_t *it) {
}
if(impl->current.size != INVALID_SLOT) {
size_t sz = sizeof(*impl->t) + impl->current.size;
if(impl->t) { free(impl->t); }
impl->t = malloc(sz);
memcpy(impl->t, readNodeRecord(xid,impl->p,impl->current.slot,impl->current.size), sz);
return 1;
} else {
free(impl->t);
if(impl->t) free(impl->t);
impl->t = 0;
return 0;
}

2
stasis/operations/lsmIterators.h
View file

@ -339,7 +339,7 @@ class treeIterator {
pageid_t *pid_tmp;
slot_ = 0;
pageid_t **hack = &pid_tmp;
pageid_t **hack = &pid_tmp;
lsmTreeIterator_value(-1,lsmIterator_,(byte**)hack);
pageid_ = *pid_tmp;
p_ = loadPage(-1,pageid_);