[svn-commits] qwell: trunk r89130 - in /trunk: cdr/ configs/

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Nov  9 10:32:01 2007
New Revision: 89130

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89130
Log:
Fix a few potential deadlocks in cdr_sqlite3_custom.
(also rename sample config to .sample)

Closes issue #11208, patch by Laureano.

Added:
    trunk/configs/cdr_sqlite3_custom.conf.sample
      - copied unchanged from r89126, trunk/configs/cdr_sqlite3_custom.conf
Removed:
    trunk/configs/cdr_sqlite3_custom.conf
Modified:
    trunk/cdr/cdr_sqlite3_custom.c

Modified: trunk/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_sqlite3_custom.c?view=diff&rev=89130&r1=89129&r2=89130
==============================================================================
--- trunk/cdr/cdr_sqlite3_custom.c (original)
+++ trunk/cdr/cdr_sqlite3_custom.c Fri Nov  9 10:32:01 2007
@@ -94,6 +94,7 @@
 
 	if (!(mappingvar = ast_variable_browse(cfg, "master"))) {
 		/* nothing configured */
+		ast_mutex_unlock(&lock);
 		ast_config_destroy(cfg);
 		return 0;
 	}
@@ -113,6 +114,7 @@
 	else {
 		ast_log(LOG_WARNING, "%s: Column names not specified. Module not loaded.\n",
 				name);
+		ast_mutex_unlock(&lock);
 		ast_config_destroy(cfg);
 		return -1;
 	}
@@ -122,6 +124,7 @@
 		ast_copy_string(values, tmp, sizeof(values));
 	else {
 		ast_log(LOG_WARNING, "%s: Values not specified. Module not loaded.\n", name);
+		ast_mutex_unlock(&lock);
 		ast_config_destroy(cfg);
 		return -1;
 	}