Merged revisions 213103 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 19 Aug 2009 21:21:00 +0000 (21:21 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 19 Aug 2009 21:21:00 +0000 (21:21 +0000)
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/trunk@213113 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_mixmonitor.c

index 7c1782b..45b2da9 100644 (file)
@@ -404,7 +404,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)) {
 
        /* 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;
        }
 
                return;
        }
 
@@ -419,7 +419,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_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;
        }
 
                return;
        }