From 9c0738b3a7a5a3443d43cd697878d0716f49b572 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 18 Dec 2013 12:00:51 +0000 Subject: [PATCH] res_calendar: Protect channel when adding datastore. 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@404137 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_calendar.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/res/res_calendar.c b/res/res_calendar.c index dfae4985a3..eebd7b480e 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -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; -- 2.47.2