On 2014-03-06 02:58, SVN commits to the Asterisk project wrote:
Author: mjordan
Date: Wed Mar 5 19:58:10 2014
New Revision: 409990
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409990
Log:
res_fax_spandsp: Fix crash when passing ulaw/alaw data to spandsp
When acting as a T.38 fax gateway, res_fax_spandsp would at times cause a crash
in libspandsp. This would occur when, during fax tone detection, a ulaw/alaw
frame would be passed to modem_connect_tones_rx. That particular routine
expects the data to be in slin format. This patch looks at the frame type and,
if the data is ulaw/alaw, converts the format to slin before passing it to
modem_connect_tones_rx.
Review: https://reviewboard.asterisk.org/r/3296
(closes issue ASTERISK-20149)
Reported by: Alexandr Gordeev
Tested by: Michal Rybarik
patches:
spandsp_g711decode.diff uploaded by Michal Rybarik (license 6578)
Modified:
branches/11/res/res_fax_spandsp.c
Modified: branches/11/res/res_fax_spandsp.c
URL:
http://svnview.digium.com/svn/asterisk/branches/11/res/res_fax_spandsp.c?view=diff&rev=409990&r1=409989&r2=409990
==============================================================================
--- branches/11/res/res_fax_spandsp.c (original)
+++ branches/11/res/res_fax_spandsp.c Wed Mar 5 19:58:10 2014
@@ -649,6 +649,8 @@
static int spandsp_v21_detect(struct ast_fax_session *s, const struct
ast_frame *f) {
struct spandsp_pvt *p = s->tech_pvt;
+ int16_t *slndata;
+ g711_state_t *decoder;
if (p->v21_detected) {
return 0;
@@ -659,10 +661,33 @@
return -1;
}
- modem_connect_tones_rx(p->tone_state, f->data.ptr, f->samples);
+ ast_debug(5, "frame={ datalen=%d, samples=%d, mallocd=%d, src=%s, flags=%d, ts=%ld, len=%ld, seqno=%d,
data.ptr=%p, subclass.format.id=%d }\n", f->datalen, f->samples, f->mallocd, f->src, f->flags,
f->ts, f->len, f->seqno, f->data.ptr, f->subclass.format.id);
+
+ /* slinear frame can be passed to spandsp */
+ if (f->subclass.format.id == AST_FORMAT_SLINEAR) {
+ modem_connect_tones_rx(p->tone_state, f->data.ptr, f->samples);
+
+ /* alaw/ulaw frame must be converted to slinear before passing to
spandsp */
+ } else if (f->subclass.format.id == AST_FORMAT_ALAW ||
f->subclass.format.id == AST_FORMAT_ULAW) {
+ if (!(slndata = ast_malloc(sizeof(*slndata) * f->samples))) {
+ return -1;
+ }
+ decoder = g711_init(NULL, (f->subclass.format.id ==
AST_FORMAT_ALAW ? G711_ALAW : G711_ULAW));
+ g711_decode(decoder, slndata, f->data.ptr, f->samples);
+ ast_debug(5, "spandsp transcoding frame from %s to slinear for v21 detection\n",
(f->subclass.format.id == AST_FORMAT_ALAW ? "G711_ALAW" : "G711_ULAW"));
+ modem_connect_tones_rx(p->tone_state, slndata, f->samples);
+ g711_release(decoder);
+ ast_free(slndata);
+
Hello,
is this patch using the g711 decode function from spandsp ? It is better to use
g711_free(...), g711_release does actually nothing.
Thanks.
Regards,
Hans
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-dev
