summaryrefslogtreecommitdiff
path: root/res/res_monitor.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2009-03-23 18:58:03 +0000
committerMark Michelson <mmichelson@digium.com>2009-03-23 18:58:03 +0000
commit85cbd1fd46947743a1f37f0743eadd80a3344e80 (patch)
treef0aba91d55a0e5b7f31440b247b546935fa2a38c /res/res_monitor.c
parent18b4508c8ec684d1f81dab0d24a1ab1d4e86302b (diff)
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/trunk@183766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_monitor.c')
-rw-r--r--res/res_monitor.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c
index c809b749b..6bd96fbca 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 = '-';