[zaptel-commits] qwell: branch 1.4 r2354 - in /branches/1.4: ./ zaptel-base.c

[zaptel-commits at lists.digium.com]

Author: qwell
Date: Fri Mar 30 13:57:48 2007
New Revision: 2354

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2354
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/zaptel-base.c

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

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=2354&r1=2353&r2=2354
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Fri Mar 30 13:57:48 2007
@@ -4932,7 +4932,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;
@@ -5817,7 +5817,7 @@
 				ms->echostate = ECHO_STATE_IDLE;
 				ms->echolastupdate = 0;
 				ms->echotimer = 0;
-				kfree(ms->ec);
+				echo_can_free(ms->ec);
 				ms->ec = NULL;
 				break;
 			}