3party/tpl
0
0
Fork 0
mirror of https://github.com/troydhanson/tpl.git synced 2024-12-26 07:31:09 +08:00
Code Issues Projects Releases Wiki Activity

Fix memory leaks for the case described in #3

Browse Source 
(strings in array of structures)
This commit is contained in:
Andrei Diaconu 2013-07-11 11:03:15 +02:00 committed by tbeu
parent 131a9b565f
commit 7adbfa38c9
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tpl.c
View File

@ -680,7 +680,7 @@ TPL_API void tpl_free(tpl_node *r) {
int mmap_bits = (TPL_RDONLY|TPL_FILE);
int ufree_bits = (TPL_MEM|TPL_UFREE);
tpl_node *nxtc,*c;
int find_next_node=0,looking,i;
int find_next_node=0,looking,num,i;
tpl_pidx *pidx,*pidx_nxt;
/* For mmap'd files, or for 'ufree' memory images , do appropriate release */
@ -707,12 +707,20 @@ TPL_API void tpl_free(tpl_node *r) {
break;
case TPL_TYPE_STR:
/* free any packed (copied) string */
for(i=0; i < c->num; i++) {
char *str = ((char**)c->data)[i];
if (str) {
tpl_hook.free(str);
((char**)c->data)[i] = NULL;
}
num = 1;
nxtc = c->next;
while (nxtc) {
if (nxtc->type == TPL_TYPE_POUND) {
num = nxtc->num;
}
nxtc = nxtc->next;
}
for (i = 0; i < c->num * num; i++) {
char *str = ((char**)c->data)[i];
if (str) {
tpl_hook.free(str);
((char**)c->data)[i] = NULL;
}
}
tpl_hook.free(c->data);
find_next_node=1;