diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-26 13:27:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-26 13:27:16 -0500 |
| commit | 795532b2d5b4769cba2524e3ab235ec21854bd3e (patch) | |
| tree | 6b7602a0ad0f6256ce73b2261d0c36504af6e236 /main | |
| parent | c82cef84419addd8788ed931f7c4f4393b90c46d (diff) | |
| parent | 5744f434f0eaba9633e7574d9cd0f8193dfd67e1 (diff) | |
Merge "ast_framehook_attach() must be called with the channel locked."
Diffstat (limited to 'main')
| -rw-r--r-- | main/bridge_basic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/bridge_basic.c b/main/bridge_basic.c index 8d7fbae70..6c411fbaf 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -3088,7 +3088,9 @@ static int attach_framehook(struct attended_transfer_properties *props, struct a ao2_ref(props, +1); target_interface.data = props; + ast_channel_lock(channel); props->target_framehook_id = ast_framehook_attach(channel, &target_interface); + ast_channel_unlock(channel); if (props->target_framehook_id == -1) { ao2_ref(props, -1); return -1; |