diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 19:25:14 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 19:25:14 +0000 |
| commit | f93ebdba02a7563314d5417a63a7e2de516663c1 (patch) | |
| tree | d96fa0b3cb5fba3fb499b6f6faf3fd29f768cc8d /res | |
| parent | 84d63d33cab0213edc53a79bfae943c0fe38a252 (diff) | |
Fix checking for CONFIG_STATUS_FILEINVALID so that modules don't crash upon trying to parse an invalid config
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@157818 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/ais/evt.c | 2 | ||||
| -rw-r--r-- | res/res_clialiases.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/ais/evt.c b/res/ais/evt.c index 2965df0e3..5de26e39c 100644 --- a/res/ais/evt.c +++ b/res/ais/evt.c @@ -475,7 +475,7 @@ static void load_config(void) const char *cat = NULL; struct ast_flags config_flags = { 0 }; - if (!(cfg = ast_config_load(filename, config_flags))) + if (!(cfg = ast_config_load(filename, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) return; while ((cat = ast_category_browse(cfg, cat))) { diff --git a/res/res_clialiases.c b/res/res_clialiases.c index a20947bb1..2d9a396a7 100644 --- a/res/res_clialiases.c +++ b/res/res_clialiases.c @@ -190,7 +190,7 @@ static void load_config(int reload) struct cli_alias *alias; struct ast_variable *v, *v1; - if (!(cfg = ast_config_load(config_file, config_flags))) { + if (!(cfg = ast_config_load(config_file, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "res_clialiases configuration file '%s' not found\n", config_file); return; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) { |