kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_fax_spandsp: Properly handle cleanup before starting FAXes.

Browse Source 
If faxing fails at a very early stage, then it is possible for
us to pass a NULL t30 state pointer to spandsp, which spandsp
is none too pleased with.

This patch ensures that we pass the correct pointer to spandsp
in the situation where we have not yet set our local t30 state
pointer.

ASTERISK-24301 #close
Reported by Matt Jordan
Patches:
	ASTERISK-24301-fax.diff Uploaded by Mark Michelson (License #5049)
........

Merged revisions 423360 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 423365 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-09-18 16:22:32 +00:00
parent 7a35800551
commit 5c5aee4458
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_fax_spandsp.c
View File

@@ -180,8 +180,25 @@ static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *deta
static void session_destroy(struct spandsp_pvt *p) static void session_destroy(struct spandsp_pvt *p)
{ {
struct ast_frame *f; struct ast_frame *f;
t30_state_t *t30_to_terminate;
t30_terminate(p->t30_state); if (p->t30_state) {
t30_to_terminate = p->t30_state;
} else if (p->ist38) {
#if SPANDSP_RELEASE_DATE >= 20080725
t30_to_terminate = &p->t38_state.t30;
#else
t30_to_terminate = &p->t38_state.t30_state;
#endif
} else {
#if SPANDSP_RELEASE_DATE >= 20080725
t30_to_terminate = &p->fax_state.t30;
#else
t30_to_terminate = &p->fax_state.t30_state;
#endif
}
t30_terminate(t30_to_terminate);
p->isdone = 1; p->isdone = 1;
ast_timer_close(p->timer); ast_timer_close(p->timer);