[svn-commits] russell: trunk r317843 - in /trunk: ./ addons/app_mysql.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri May  6 14:25:35 2011
New Revision: 317843

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

........
  r317837 | russell | 2011-05-06 14:24:11 -0500 (Fri, 06 May 2011) | 11 lines
  
  Fix a crash in the MySQL() application.
  
  This code was not handling channel datastores safely.  The channel
  must be locked.
  
  (closes issue #17964)
  Reported by: wuwu
  Patches:
        issue17964_addon_1.6.2_svn.patch uploaded by seanbright (license 71)
  Tested by: wuwu
........

Modified:
    trunk/   (props changed)
    trunk/addons/app_mysql.c

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

Modified: trunk/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/app_mysql.c?view=diff&rev=317843&r1=317842&r2=317843
==============================================================================
--- trunk/addons/app_mysql.c (original)
+++ trunk/addons/app_mysql.c Fri May  6 14:25:35 2011
@@ -546,7 +546,10 @@
 	result = 0;
 
 	if (autoclear) {
-		struct ast_datastore *mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
+		struct ast_datastore *mysql_store = NULL;
+
+		ast_channel_lock(chan);
+		mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
 		if (!mysql_store) {
 			if (!(mysql_store = ast_datastore_alloc(&mysql_ds_info, NULL))) {
 				ast_log(LOG_WARNING, "Unable to allocate new datastore.\n");
@@ -555,6 +558,7 @@
 				ast_channel_datastore_add(chan, mysql_store);
 			}
 		}
+		ast_channel_unlock(chan);
 	}
 	ast_mutex_lock(&_mysql_mutex);