From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 23 Mar 2009 18:59:30 +0000 (+0000)
Subject: Merged revisions 183766 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36cd2b9a504cf211c6a101a44d353ca615d022aa;p=thirdparty%2Fasterisk.git

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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_monitor.c b/res/res_monitor.c
index c809b749b8..6bd96fbca0 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -587,11 +587,7 @@ static int start_monitor_action(struct mansession *s, const struct message *m)
 
 	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 = '-';