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 /cdr/cdr_odbc.c | |
| 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 'cdr/cdr_odbc.c')
| -rw-r--r-- | cdr/cdr_odbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index d4db02b52..3c2cfb2ec 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -161,7 +161,7 @@ static int odbc_load_module(int reload) do { cfg = ast_config_load(config_file, config_flags); - if (!cfg) { + if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config_file); res = AST_MODULE_LOAD_DECLINE; break; @@ -228,7 +228,7 @@ static int odbc_load_module(int reload) } } while (0); - if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED) + if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID) ast_config_destroy(cfg); return res; } |