diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-04-11 12:43:34 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-04-11 12:43:34 +0000 |
| commit | d6e2c50058de41eb80d7abc27786825cb65ddccf (patch) | |
| tree | 1070269c9ad4edfc57a420b648c75a5408f4372f /apps | |
| parent | f65dd23bf4fbb1cb909755ac3d36fc6aa9f709bb (diff) | |
bridging: Ensure locking during snapshot creation
While the vast majority of bridge snapshot creation is locked properly,
there are currently some instances that are not. This adds the missing
locking to ensure bridge state is not malleable during snapshot
creation.
(closes issue ASTERISK-22904)
Review: https://reviewboard.asterisk.org/r/3415/
Reported by: Matt Jordan
........
Merged revisions 412193 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412194 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index b034ab3f9..3a2010179 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -453,10 +453,13 @@ static void send_conf_stasis(struct confbridge_conference *conference, struct as ast_json_object_update(json_object, extras); } + ast_bridge_lock(conference->bridge); msg = ast_bridge_blob_create(type, conference->bridge, chan, json_object); + ast_bridge_unlock(conference->bridge); + if (!msg) { return; } |