kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plug a memory leak when reading configs with their comments.

Browse Source 
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.4@241015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2010-01-18 19:54:19 +00:00
parent 7e7e6da09e
commit 1926da52e7
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/config.c
View File

@@ -183,6 +183,8 @@ struct ast_config {
int max_include_level;
};
static void ast_destroy_comment(struct ast_comment **comment);
struct ast_variable *ast_variable_new(const char *name, const char *value)
{
struct ast_variable *variable;
@@ -218,6 +220,8 @@ void ast_variables_destroy(struct ast_variable *v)
while(v) {
vn = v;
v = v->next;
ast_destroy_comment(&vn->precomments);
ast_destroy_comment(&vn->sameline);
free(vn);
}
}
@@ -344,19 +348,22 @@ void ast_category_append(struct ast_config *config, struct ast_category *categor
config->current = category;
}
static void ast_destroy_comments(struct ast_category *cat)
static void ast_destroy_comment(struct ast_comment **comment)
{
struct ast_comment *n, *p;
for (p=cat->precomments; p; p=n) {
for (p = *comment; p; p = n) {
n = p->next;
free(p);
}
for (p=cat->sameline; p; p=n) {
n = p->next;
free(p);
}
cat->precomments = NULL;
cat->sameline = NULL;
*comment = NULL;
}
static void ast_destroy_comments(struct ast_category *cat)
{
ast_destroy_comment(&cat->precomments);
ast_destroy_comment(&cat->sameline);
}
static void ast_destroy_template_list(struct ast_category *cat)