aboutsummaryrefslogtreecommitdiffstats
path: root/cdr/cdr_odbc.c
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 19:25:14 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 19:25:14 +0000
commitf93ebdba02a7563314d5417a63a7e2de516663c1 (patch)
treed96fa0b3cb5fba3fb499b6f6faf3fd29f768cc8d /cdr/cdr_odbc.c
parent84d63d33cab0213edc53a79bfae943c0fe38a252 (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 'cdr/cdr_odbc.c')
-rw-r--r--cdr/cdr_odbc.c4
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;
}