kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_framehook_attach() must be called with the channel locked.

Browse Source 
The framehook container could become corrupted if the channel lock is not
held before calling.

Change-Id: I1a6b957a1f7b899eb29a186915f8cccab886a438
This commit is contained in:
Richard Mudgett
2016-08-22 15:01:37 -05:00
parent d2e03c252d
commit 5744f434f0
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/res_pjsip_t38.c
View File

@@ -501,25 +501,27 @@ static void t38_attach_framehook(struct ast_sip_session *session)
return;
}
/* Skip attaching the framehook if the T.38 datastore already exists for the channel */
ast_channel_lock(session->channel);
if ((datastore = ast_channel_datastore_find(session->channel, &t38_framehook_datastore, NULL))) {
/* Skip attaching the framehook if the T.38 datastore already exists for the channel */
datastore = ast_channel_datastore_find(session->channel, &t38_framehook_datastore,
NULL);
if (datastore) {
ast_channel_unlock(session->channel);
return;
}
ast_channel_unlock(session->channel);
framehook_id = ast_framehook_attach(session->channel, &hook);
if (framehook_id < 0) {
ast_log(LOG_WARNING, "Could not attach T.38 Frame hook to channel, T.38 will be unavailable on '%s'\n",
ast_log(LOG_WARNING, "Could not attach T.38 Frame hook, T.38 will be unavailable on '%s'\n",
ast_channel_name(session->channel));
ast_channel_unlock(session->channel);
return;
}
ast_channel_lock(session->channel);
datastore = ast_datastore_alloc(&t38_framehook_datastore, NULL);
if (!datastore) {
ast_log(LOG_ERROR, "Could not attach T.38 Frame hook to channel, T.38 will be unavailable on '%s'\n",
ast_log(LOG_ERROR, "Could not alloc T.38 Frame hook datastore, T.38 will be unavailable on '%s'\n",
ast_channel_name(session->channel));
ast_framehook_detach(session->channel, framehook_id);
ast_channel_unlock(session->channel);