Merged revisions 213113 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r213113 | dvossel | 2009-08-19 16:21:00 -0500 (Wed, 19 Aug 2009) | 14 lines

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

  ........
    r213103 | dvossel | 2009-08-19 16:18:37 -0500 (Wed, 19 Aug 2009) | 8 lines

    Fixes memory leak caused by incorrectly freeing mixmonitor

    (closes issue #15699)
    Reported by: edantie
    Patches:
          mixmonitor.patch uploaded by edantie (license 862)
  ........
................

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

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index f246b371778939e56f88da31efe1657c4091109b..af06f3257738f795b3fdae3e15b66fe93d1961ed 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -371,7 +371,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
 
        /* Setup the actual spy before creating our thread */
        if (ast_audiohook_init(&mixmonitor->audiohook, AST_AUDIOHOOK_TYPE_SPY, mixmonitor_spy_type)) {
-               ast_free(mixmonitor);
+               mixmonitor_free(mixmonitor);
                return;
        }
 
@@ -386,7 +386,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
                ast_log(LOG_WARNING, "Unable to add '%s' spy to channel '%s'\n",
                        mixmonitor_spy_type, chan->name);
                ast_audiohook_destroy(&mixmonitor->audiohook);
-               ast_free(mixmonitor);
+               mixmonitor_free(mixmonitor);
                return;
        }