dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317843 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2011-05-06 19:25:35 +00:00
parent 48cc3e3e33
commit 1f776a7d27
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/app_mysql.c
View File

@ -546,7 +546,10 @@ static int MYSQL_exec(struct ast_channel *chan, const char *data)
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 @@ static int MYSQL_exec(struct ast_channel *chan, const char *data)
ast_channel_datastore_add(chan, mysql_store);
}
}
ast_channel_unlock(chan);
}
ast_mutex_lock(&_mysql_mutex);