From: Jeremy McNamara <jj@nufone.net>
Date: Sun, 4 Jan 2004 05:11:53 +0000 (+0000)
Subject: prevent deadlock if no config file
X-Git-Tag: 0.7.0~123
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=d4b69a2f242f7a1f29835932181555e4cca9d41b;hp=d0a7e585d78d1da3b5de04057ddd4c17ddcbb5bf

prevent deadlock if no config file


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index c9209a3..fddd688 100755
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -241,7 +241,7 @@ static int odbc_unload_module(void)
 
 static int odbc_load_module(void)
 {
-	int res;
+	int res = 0;
 	struct ast_config *cfg;
 	struct ast_variable *var;
 	char *tmp;
@@ -252,13 +252,13 @@ static int odbc_load_module(void)
 	if (!cfg)
 	{
 		ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config);
-		return 0;
+		goto out;
 	}
 	
 	var = ast_variable_browse(cfg, "global");
 	if (!var) {
 		/* nothing configured */
-		return 0;
+		goto out;
 	}
 
 	tmp = ast_variable_retrieve(cfg,"global","dsn");
@@ -368,6 +368,7 @@ static int odbc_load_module(void)
 	{
 		ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
 	}
+out:
 	ast_mutex_unlock(&odbc_lock);
 	return res;
 }