[svn-commits] qwell: trunk r2355 - in /trunk: ./ zaptel.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Mar 30 14:00:28 2007
New Revision: 2355

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2355
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=2355&r1=2354&r2=2355
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Fri Mar 30 14:00:28 2007
@@ -4936,7 +4936,7 @@
 				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 @@
 				ms->echostate = ECHO_STATE_IDLE;
 				ms->echolastupdate = 0;
 				ms->echotimer = 0;
-				kfree(ms->ec);
+				echo_can_free(ms->ec);
 				ms->ec = NULL;
 				break;
 			}