[svn-commits] markm: trunk r319813 - in /trunk: ./ cel/cel_odbc.c

[SVN commits to the Digium repositories]

Author: markm
Date: Thu May 19 13:12:49 2011
New Revision: 319813

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319813
Log:
Merged revisions 319812 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r319812 | markm | 2011-05-19 13:59:01 -0400 (Thu, 19 May 2011) | 9 lines
  
  In cel_odbc, an uninitialized RWLIST is attempted to be locked.
  
  Added INIT and DESTROY for the RWLIST odbc_tables
  
  (closes issue #19331)
  Reported by: kobaz
  Patches: 
        odbc_cel.patch uploaded by kobaz (license 834)
........

Modified:
    trunk/   (props changed)
    trunk/cel/cel_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_odbc.c?view=diff&rev=319813&r1=319812&r2=319813
==============================================================================
--- trunk/cel/cel_odbc.c (original)
+++ trunk/cel/cel_odbc.c Thu May 19 13:12:49 2011
@@ -751,11 +751,15 @@
 
 	free_config();
 	AST_RWLIST_UNLOCK(&odbc_tables);
+	AST_RWLIST_HEAD_DESTROY(&odbc_tables);
+        
 	return 0;
 }
 
 static int load_module(void)
 {
+	AST_RWLIST_HEAD_INIT(&odbc_tables);
+
 	if (AST_RWLIST_WRLOCK(&odbc_tables)) {
 		ast_log(LOG_ERROR, "Unable to lock column list.  Load failed.\n");
 		return 0;