diff options
| author | Torrey Searle <torrey@voxbone.com> | 2016-09-29 20:08:07 +0200 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2016-10-12 06:53:54 -0500 |
| commit | 86c15db6a1bacd92f31c3a128717f91060e6496d (patch) | |
| tree | 8c3c320d914f14371718faa966dfffb734ce591a | |
| parent | 2fbc0531e0d2e8f90c05ee44e26a313a014b32c3 (diff) | |
res_fax: Fix a tight race condition causing fax to crash in audio fallback
When T.38 gets rejected and G711 failback occurs there is a period of
time where neither AST_FAX_TECH_T38 nor AST_FAX_TECH_AUDIO is set,
leading to a crash.
Change-Id: Icc3f457b2292d48a9d7843dac0028347420cc982
| -rw-r--r-- | res/res_fax.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index e37091b31..ab0945a89 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -1600,6 +1600,13 @@ static int generic_fax_exec(struct ast_channel *chan, struct ast_fax_session_det chancount = 1; + /* Make sure one or the other is set to avoid race condition */ + if (t38negotiated) { + details->caps |= AST_FAX_TECH_T38; + } else { + details->caps |= AST_FAX_TECH_AUDIO; + } + /* create the FAX session */ if (!(fax = fax_session_new(details, chan, reserved, token))) { ast_log(LOG_ERROR, "Can't create a FAX session, FAX attempt failed.\n"); |