diff options
| author | Corey Farrell <git@cfware.com> | 2014-10-28 21:10:42 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2014-10-28 21:10:42 +0000 |
| commit | 7205d76d7d001b61afcb5466410a3892cdcc6047 (patch) | |
| tree | 93edb7146983b3dd6ca6a766ae51d2cef09ea315 /res/res_fax.c | |
| parent | 67e496c275fa2fa04b638eec620a2c08e404339b (diff) | |
res_fax: Resolve T38 gateway frame leak.
When frames are translated by a fax gateway they need to be freed. The
existing call to ast_frfree was unreachable. This change reorganizes
fax_gateway_framehook to ensure that ast_frfree is called when needed.
ASTERISK-24457 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4115/
........
Merged revisions 426527 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 426528 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 426529 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@426530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_fax.c')
| -rw-r--r-- | res/res_fax.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 01228c175..cfe3dd10d 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -3419,26 +3419,25 @@ static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct /* in gateway mode, gateway some packets */ if (gateway->t38_state == T38_STATE_NEGOTIATED) { + struct ast_trans_pvt *readtrans; /* framehooks are called in __ast_read() before frame format * 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 (ast_channel_readtrans(active) && (f = ast_translate(ast_channel_readtrans(active), f, 1)) == NULL) { + if ((f->frametype == AST_FRAME_VOICE) && (ast_format_cmp(f->subclass.format, ast_format_slin) != AST_FORMAT_CMP_EQUAL) + && (readtrans = ast_channel_readtrans(active))) { + if ((f = ast_translate(readtrans, f, 1)) == NULL) { f = &ast_null_frame; return f; } - } - - /* XXX we ignore the return value here, perhaps we should - * disable the gateway if a write fails. I am not sure how a - * write would fail, or even if a failure would be fatal so for - * now we'll just ignore the return value. */ - gateway->s->tech->write(gateway->s, f); - if ((f->frametype == AST_FRAME_VOICE) && (ast_format_cmp(f->subclass.format, ast_format_slin) != AST_FORMAT_CMP_EQUAL) && - ast_channel_readtrans(active)) { - /* Only free the frame if we translated / duplicated it - otherwise, - * let whatever is outside the frame hook do it */ + /* XXX we ignore the return value here, perhaps we should + * disable the gateway if a write fails. I am not sure how a + * write would fail, or even if a failure would be fatal so for + * now we'll just ignore the return value. */ + gateway->s->tech->write(gateway->s, f); ast_frfree(f); + } else { + gateway->s->tech->write(gateway->s, f); } + f = &ast_null_frame; return f; } |