kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_fax: fix segfault on inactive "reserved" fax session" into 13

Browse Source
This commit is contained in:
Joshua Colp
2019-06-04 05:29:07 -05:00
committed by Gerrit Code Review
parent 6df25921ca e306c62ff1
commit 1c665ae39b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_fax.c
View File

@@ -1110,6 +1110,7 @@ static void destroy_session(void *session)
s->details->caps &= ~AST_FAX_TECH_GATEWAY; s->details->caps &= ~AST_FAX_TECH_GATEWAY;
} }
ao2_ref(s->details, -1); ao2_ref(s->details, -1);
s->details = NULL;
} }
if (s->debug_info) { if (s->debug_info) {
@@ -2915,7 +2916,8 @@ static int fax_gateway_start(struct fax_gateway *gateway, struct ast_fax_session
int start_res; int start_res;
/* if the fax gateway is already started then do nothing */ /* if the fax gateway is already started then do nothing */
if (gateway->s && gateway->s->state != AST_FAX_STATE_RESERVED) { if (gateway->s &&
gateway->s->state != AST_FAX_STATE_RESERVED && gateway->s->state != AST_FAX_STATE_INACTIVE) {
return 0; return 0;
} }
@@ -3510,6 +3512,12 @@ static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct
/* in gateway mode, gateway some packets */ /* in gateway mode, gateway some packets */
if (gateway->t38_state == T38_STATE_NEGOTIATED) { if (gateway->t38_state == T38_STATE_NEGOTIATED) {
struct ast_trans_pvt *readtrans; struct ast_trans_pvt *readtrans;
if (!gateway->s || !gateway->s->tech_pvt) {
ast_log(LOG_ERROR, "no FAX session on chan %s for T.38 gateway session, odd", ast_channel_name(chan));
return f;
}
/* framehooks are called in __ast_read() before frame format /* framehooks are called in __ast_read() before frame format
* translation is done, so we need to translate here */ * translation is done, so we need to translate here */
if ((f->frametype == AST_FRAME_VOICE) && (ast_format_cmp(f->subclass.format, ast_format_slin) != AST_FORMAT_CMP_EQUAL) if ((f->frametype == AST_FRAME_VOICE) && (ast_format_cmp(f->subclass.format, ast_format_slin) != AST_FORMAT_CMP_EQUAL)