osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Actually destroy chunks in emem_free_all. We lose the efficiency of re-using 

them, but until I can figure out the correct logic for that (3rd try and
counting...) this at least plugs the leak.

svn path=/trunk/; revision=45412
This commit is contained in:
Evan Huus 2012-10-08 22:27:03 +00:00
parent 1bed23e6d0
commit b01f1d3762
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/emem.c
View File

@ -1208,6 +1208,8 @@ emem_free_all(emem_pool_t *mem)
npc = mem->free_list;
while (npc != NULL) {
if (use_chunks) {
emem_chunk_t *next = npc->next;
while (npc->canary_last != NULL) {
npc->canary_last = emem_canary_next(mem->canary, npc->canary_last, NULL);
/* XXX, check if canary_last is inside allocated memory? */
@ -1220,9 +1222,9 @@ emem_free_all(emem_pool_t *mem)
(npc->free_offset - npc->free_offset_init),
FALSE);
npc->amount_free = npc->amount_free_init;
npc->free_offset = npc->free_offset_init;
npc = npc->next;
emem_destroy_chunk(npc);
npc = next;
} else {
emem_chunk_t *next = npc->next;
@ -1234,10 +1236,7 @@ emem_free_all(emem_pool_t *mem)
}
}
if (!use_chunks) {
/* We've freed all this memory already */
mem->free_list = NULL;
}
mem->free_list = NULL;
/* release/reset all allocated trees */
for(tree_list=mem->trees;tree_list;tree_list=tree_list->next){