[svn-commits] mvanbaak: branch 1.6.0 r130575 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sun Jul 13 17:53:25 2008
New Revision: 130575

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130575
Log:
Merged revisions 130574 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r130574 | mvanbaak | 2008-07-14 00:50:31 +0200 (Mon, 14 Jul 2008) | 16 lines

Merged revisions 130573 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130573 | mvanbaak | 2008-07-14 00:48:51 +0200 (Mon, 14 Jul 2008) | 8 lines

fix memory leak when originate from manager cannot create a thread

(closes issue #13069)
Reported by: gknispel_proformatique
Patches:
      asterisk_trunk_action_originate.patch uploaded by gknispel (license 261)
	  Tested by: gknispel_proformatique, mvanbaak

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=130575&r1=130574&r2=130575
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Sun Jul 13 17:53:25 2008
@@ -2195,6 +2195,7 @@
 			fast->timeout = to;
 			fast->priority = pi;
 			if (ast_pthread_create_detached(&th, NULL, fast_originate, fast)) {
+				ast_free(fast);
 				res = -1;
 			} else {
 				res = 0;