kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 241016 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines
  
  Merged revisions 241015 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines
    
    Plug a memory leak when reading configs with their comments.
    
    While reading through configuration files with the intent of returning their
    full contents (comments specifically) we allocated some memory and then forgot
    to free it.  This doesn't fix 16554 but clears up a leak I had in the lab.
    
    (issue #16554)
    Reported by: mav3rick
    Patches:
          issue16554_20100118.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2010-01-18 20:01:48 +00:00
parent 9917b29d24
commit c319632d70
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main/config.c
View File

@@ -375,6 +375,18 @@ void ast_variable_insert(struct ast_category *category, struct ast_variable *var
}
}
static void ast_comment_destroy(struct ast_comment **comment)
{
struct ast_comment *n, *p;
for (p = *comment; p; p = n) {
n = p->next;
ast_free(p);
}
*comment = NULL;
}
void ast_variables_destroy(struct ast_variable *v)
{
struct ast_variable *vn;
@@ -382,6 +394,9 @@ void ast_variables_destroy(struct ast_variable *v)
while (v) {
vn = v;
v = v->next;
ast_comment_destroy(&vn->precomments);
ast_comment_destroy(&vn->sameline);
ast_comment_destroy(&vn->trailing);
ast_free(vn);
}
}
@@ -522,27 +537,6 @@ void ast_category_insert(struct ast_config *config, struct ast_category *cat, co
}
}
static void ast_destroy_comments(struct ast_category *cat)
{
struct ast_comment *n, *p;
for (p=cat->precomments; p; p=n) {
n = p->next;
free(p);
}
for (p=cat->sameline; p; p=n) {
n = p->next;
free(p);
}
for (p=cat->trailing; p; p=n) {
n = p->next;
free(p);
}
cat->precomments = NULL;
cat->sameline = NULL;
cat->trailing = NULL;
}
static void ast_destroy_template_list(struct ast_category *cat)
{
struct ast_category_template_instance *x;
@@ -558,7 +552,9 @@ void ast_category_destroy(struct ast_category *cat)
free(cat->file);
cat->file = 0;
}
ast_destroy_comments(cat);
ast_comment_destroy(&cat->precomments);
ast_comment_destroy(&cat->sameline);
ast_comment_destroy(&cat->trailing);
ast_destroy_template_list(cat);
ast_free(cat);
}