From: Sean Bright <sean@malleable.com>
Date: Tue, 18 Mar 2014 11:50:13 +0000 (+0000)
Subject: res_fax_spandsp: Use g711_free() when available.
X-Git-Tag: 11.9.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7199c911d9b2b53971d3243a3d34243e792a5db0;p=thirdparty%2Fasterisk.git

res_fax_spandsp: Use g711_free() when available.

Per Johann Steinwendtner on the asterisk-dev mailing list:

http://lists.digium.com/pipermail/asterisk-dev/2014-March/066102.html

g711_free() was introduced in spandsp 0.0.6pre4 and g711_release() became a
noop.  I opted not to remove the call to g711_release() since it is harmless
and to call g711_free() if we have a sufficiently recent version of spandsp.

(issue ASTERISK-20149)
Reported by: Alexandr Gordeev


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@410829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index cc5e677db6..5c88c85f5c 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -677,6 +677,9 @@ static int spandsp_v21_detect(struct ast_fax_session *s, const struct ast_frame
 		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);
+#if SPANDSP_RELEASE_DATE >= 20090220
+		g711_free(decoder);
+#endif
 		ast_free(slndata);
 
 	/* frame in other formats cannot be passed to spandsp, it could cause segfault */