sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "ast_framehook_detach() must be called with the channel locked."

This commit is contained in:
Joshua Colp 2016-08-26 14:02:45 -05:00 committed by Gerrit Code Review
parent 795532b2d5 b86771d1bf
commit 44b8cc8b48
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_fax.c
View File

@ -4509,7 +4509,9 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
ast_log(LOG_WARNING, "Attempt to attach a T.38 gateway on channel (%s) with gateway already running.\n", ast_channel_name(chan));
}
} else if (ast_false(val)) {
ast_channel_lock(chan);
ast_framehook_detach(chan, details->gateway_id);
ast_channel_unlock(chan);
details->gateway_id = -1;
} else {
ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);
@ -4561,7 +4563,9 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
ast_log(LOG_WARNING, "Attempt to attach a FAX detect on channel (%s) with FAX detect already running.\n", ast_channel_name(chan));
}
} else if (ast_false(val)) {
ast_channel_lock(chan);
ast_framehook_detach(chan, details->faxdetect_id);
ast_channel_unlock(chan);
details->faxdetect_id = -1;
} else {
ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);

2
res/res_pjsip_refer.c
View File

@ -641,7 +641,9 @@ static void refer_blind_callback(struct ast_channel *chan, struct transfer_chann
refer_progress_notify(notification);
}
ast_channel_lock(chan);
ast_framehook_detach(chan, refer->progress->framehook);
ast_channel_unlock(chan);
ao2_cleanup(refer->progress);
}