[asterisk-commits] file: branch file/bridging-softmixgen2 r184679 - in /team/file/bridging-softm...

[SVN commits to the Asterisk project]

Author: file
Date: Fri Mar 27 11:05:57 2009
New Revision: 184679

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184679
Log:
Merged revisions 184673,184677 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184673 | file | 2009-03-27 12:46:46 -0300 (Fri, 27 Mar 2009) | 7 lines
  
  Fix speech structure leak in the AGI speech recognition integration.
  
  The AGI dialplan applications did not destroy the speech structure automatically
  if it was not destroyed by the running AGI script. They will now do this.
  
  (issue LUMENVOX-15) 
........
  r184677 | file | 2009-03-27 12:57:28 -0300 (Fri, 27 Mar 2009) | 7 lines
  
  Fix a potential timer leak in bridge_softmix.
  
  It is possible for a bridge to be created without actually being used.
  In that scenario a timing file descriptor would be opened and not
  closed. To fix this the timing file descriptor is now closed in the
  destroy callback, not the thread function.
........

Modified:
    team/file/bridging-softmixgen2/   (props changed)
    team/file/bridging-softmixgen2/res/res_agi.c

Propchange: team/file/bridging-softmixgen2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 27 11:05:57 2009
@@ -1,1 +1,1 @@
-/trunk:1-184658
+/trunk:1-184678

Modified: team/file/bridging-softmixgen2/res/res_agi.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging-softmixgen2/res/res_agi.c?view=diff&rev=184679&r1=184678&r2=184679
==============================================================================
--- team/file/bridging-softmixgen2/res/res_agi.c (original)
+++ team/file/bridging-softmixgen2/res/res_agi.c Fri Mar 27 11:05:57 2009
@@ -737,6 +737,10 @@
 			ast_frfree(f);
 		}
 	}
+
+	if (async_agi.speech) {
+		ast_speech_destroy(async_agi.speech);
+	}
 quit:
 	/* notify manager users this channel cannot be
 	   controlled anymore by Async AGI */
@@ -2929,6 +2933,9 @@
 			}
 		}
 	}
+	if (agi->speech) {
+		ast_speech_destroy(agi->speech);
+	}
 	/* Notify process */
 	if (send_sighup) {
 		if (pid > -1) {