[asterisk-commits] tilghman: branch 1.6.2 r268934 - in /branches/1.6.2: ./ res/res_config_sqlite.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jun  8 01:58:22 2010
New Revision: 268934

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268934
Log:
Merged revisions 268933 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r268933 | tilghman | 2010-06-08 01:57:24 -0500 (Tue, 08 Jun 2010) | 2 lines
  
  Release list lock before returning on error.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_config_sqlite.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/res_config_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_config_sqlite.c?view=diff&rev=268934&r1=268933&r2=268934
==============================================================================
--- branches/1.6.2/res/res_config_sqlite.c (original)
+++ branches/1.6.2/res/res_config_sqlite.c Tue Jun  8 01:58:22 2010
@@ -686,12 +686,14 @@
 		ast_log(LOG_WARNING, "SQLite error %d: %s\n", err, errstr);
 		ast_free(errstr);
 		free_table(tblptr);
+		AST_RWLIST_UNLOCK(&sqlite_tables);
 		return NULL;
 	}
 	ast_mutex_unlock(&mutex);
 
 	if (AST_LIST_EMPTY(&(tblptr->columns))) {
 		free_table(tblptr);
+		AST_RWLIST_UNLOCK(&sqlite_tables);
 		return NULL;
 	}