diff options
| author | Terry Wilson <twilson@digium.com> | 2008-11-19 19:25:14 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2008-11-19 19:25:14 +0000 |
| commit | d66a8cd26481d94426cbbffef212f63d5c0da378 (patch) | |
| tree | d96fa0b3cb5fba3fb499b6f6faf3fd29f768cc8d /main | |
| parent | 3d8fb2d878868149586b5c0b5fa9d6d75ae25237 (diff) | |
Fix checking for CONFIG_STATUS_FILEINVALID so that modules don't crash upon trying to parse an invalid config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 2 | ||||
| -rw-r--r-- | main/xmldoc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/logger.c b/main/logger.c index b4f4c4dd0..2c312eecc 100644 --- a/main/logger.c +++ b/main/logger.c @@ -326,7 +326,7 @@ static void init_logger_chain(int locked) const char *s; struct ast_flags config_flags = { 0 }; - if (!(cfg = ast_config_load2("logger.conf", "logger", config_flags))) + if (!(cfg = ast_config_load2("logger.conf", "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) return; /* delete our list of log channels */ diff --git a/main/xmldoc.c b/main/xmldoc.c index c3c9e80c1..273ddc6ca 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -1721,7 +1721,7 @@ int ast_xmldoc_load_documentation(void) /* setup default XML documentation language */ snprintf(documentation_language, sizeof(documentation_language), default_documentation_language); - if ((cfg = ast_config_load2("asterisk.conf", "" /* core can't reload */, cnfflags))) { + if ((cfg = ast_config_load2("asterisk.conf", "" /* core can't reload */, cnfflags)) && cfg != CONFIG_STATUS_FILEINVALID) { for (var = ast_variable_browse(cfg, "options"); var; var = var->next) { if (!strcasecmp(var->name, "documentation_language")) { if (!ast_strlen_zero(var->value)) { |