diff options
author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-30 19:00:28 +0000 |
---|---|---|
committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-30 19:00:28 +0000 |
commit | aa05b1828a827bb4bbe4985fd287d5a3a153cfc8 (patch) | |
tree | 34bd86b1683cc7e518a1b330d2c9bf15c399a3f0 | |
parent | 52075e2a6efde651d071f411de7dd22d59f841e7 (diff) |
Merged revisions 2354 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2354 | qwell | 2007-03-30 13:57:48 -0500 (Fri, 30 Mar 2007) | 12 lines
Merged revisions 2353 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2353 | qwell | 2007-03-30 13:56:46 -0500 (Fri, 30 Mar 2007) | 4 lines
Fix an issue where an echo can was freed incorrectly in certain circumstances.
Issue 9292, fix suggested by ddv2005.
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2355 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | zaptel.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4936,7 +4936,7 @@ static inline void __zt_process_getaudio_chunk(struct zt_chan *ss, unsigned char ms->echostate = ECHO_STATE_IDLE; ms->echolastupdate = 0; ms->echotimer = 0; - kfree(ms->ec); + echo_can_free(ms->ec); ms->ec = NULL; __qevent(ss, ZT_EVENT_EC_DISABLED); break; @@ -5810,7 +5810,7 @@ static inline void __zt_process_putaudio_chunk(struct zt_chan *ss, unsigned char ms->echostate = ECHO_STATE_IDLE; ms->echolastupdate = 0; ms->echotimer = 0; - kfree(ms->ec); + echo_can_free(ms->ec); ms->ec = NULL; break; } |