]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_calendar: Protect channel when adding datastore.
authorJoshua Colp <jcolp@digium.com>
Wed, 18 Dec 2013 12:01:46 +0000 (12:01 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 18 Dec 2013 12:01:46 +0000 (12:01 +0000)
This change adds a missing channel lock when adding a datastore
to a channel.
........

Merged revisions 404135 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 404136 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 404137 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404138 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_calendar.c

index dfae4985a3ac21eacd4eb6aecd2215bf88fc8735..eebd7b480e06f452f9431592149f2be07073ecda 100644 (file)
@@ -775,7 +775,10 @@ static void *do_notify(void *data)
        datastore->inheritance = DATASTORE_INHERIT_FOREVER;
 
        ao2_ref(event, +1);
+
+       ast_channel_lock(chan);
        res = ast_channel_datastore_add(chan, datastore);
+       ast_channel_unlock(chan);
 
        if (!(tmpstr = ast_str_create(32))) {
                goto notify_cleanup;