kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leaks in config loader (bug #4223)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-07 21:28:04 +00:00
parent 178842ec27
commit 304bc75cf1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config.c
View File

@@ -499,7 +499,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
if(!ast_strlen_zero(exec_file)) if(!ast_strlen_zero(exec_file))
unlink(exec_file); unlink(exec_file);
if(!do_include) if(!do_include)
return -1; return 0;
} else { } else {
ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n", ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n",
@@ -556,6 +556,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
int lineno=0; int lineno=0;
int comment = 0, nest[MAX_NESTED_COMMENTS]; int comment = 0, nest[MAX_NESTED_COMMENTS];
struct ast_category *cat = NULL; struct ast_category *cat = NULL;
int count = 0;
cat = ast_config_get_current_category(cfg); cat = ast_config_get_current_category(cfg);
@@ -592,6 +593,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
fflush(stdout); fflush(stdout);
} }
if ((f = fopen(fn, "r"))) { if ((f = fopen(fn, "r"))) {
count++;
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Parsing %s\n", fn); ast_log(LOG_DEBUG, "Parsing %s\n", fn);
else if (option_verbose > 1) else if (option_verbose > 1)
@@ -674,6 +676,8 @@ static struct ast_config *config_text_file_load(const char *database, const char
} }
} }
#endif #endif
if (count == 0)
return NULL;
return cfg; return cfg;
} }
@@ -793,17 +797,19 @@ static int append_mapping(char *name, char *driver, char *database, char *table)
void read_config_maps(void) void read_config_maps(void)
{ {
struct ast_config *config; struct ast_config *config, *configtmp;
struct ast_variable *v; struct ast_variable *v;
char *driver, *table, *database, *stringp; char *driver, *table, *database, *stringp;
clear_config_maps(); clear_config_maps();
config = ast_config_new(); configtmp = ast_config_new();
config->max_include_level = 1; configtmp->max_include_level = 1;
config = ast_config_internal_load(extconfig_conf, config); config = ast_config_internal_load(extconfig_conf, configtmp);
if (!config) if (!config) {
ast_config_destroy(configtmp);
return; return;
}
for (v = ast_variable_browse(config, "settings"); v; v = v->next) { for (v = ast_variable_browse(config, "settings"); v; v = v->next) {
stringp = v->value; stringp = v->value;