[asterisk-commits] mmichelson: branch 1.6.2 r183769 - in /branches/1.6.2: ./ res/res_monitor.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Mar 23 14:00:01 2009
New Revision: 183769

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

................
  r183766 | mmichelson | 2009-03-23 13:58:03 -0500 (Mon, 23 Mar 2009) | 13 lines
  
  Merged revisions 183700 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183700 | mmichelson | 2009-03-23 12:59:28 -0500 (Mon, 23 Mar 2009) | 7 lines
    
    Fix a memory leak in res_monitor.c
    
    The only way that this leak would occur is if Monitor were started
    using the Manager interface and no File: header were given. Discovered
    while reviewing the ast_channel_ao2 review request.
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_monitor.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Mar 23 14:00:01 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766

Modified: branches/1.6.2/res/res_monitor.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/res/res_monitor.c?view=diff&rev=183769&r1=183768&r2=183769
==============================================================================
--- branches/1.6.2/res/res_monitor.c (original)
+++ branches/1.6.2/res/res_monitor.c Mon Mar 23 14:00:01 2009
@@ -587,11 +587,7 @@
 
 	if (ast_strlen_zero(fname)) {
 		/* No filename base specified, default to channel name as per CLI */		
-		if (!(fname = ast_strdup(c->name))) {
-			astman_send_error(s, m, "Could not start monitoring channel");
-			ast_channel_unlock(c);
-			return 0;
-		}
+		fname = ast_strdupa(c->name);
 		/* Channels have the format technology/channel_name - have to replace that /  */
 		if ((d = strchr(fname, '/'))) 
 			*d = '-';