Merged revisions 280346 via svnmerge from
authorJean Galarneau <jgalarneau@digium.com>
Thu, 29 Jul 2010 16:47:23 +0000 (16:47 +0000)
committerJean Galarneau <jgalarneau@digium.com>
Thu, 29 Jul 2010 16:47:23 +0000 (16:47 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280346 | jeang | 2010-07-29 11:07:16 -0500 (Thu, 29 Jul 2010) | 17 lines

  Merged revisions 280345 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r280345 | jeang | 2010-07-29 11:01:35 -0500 (Thu, 29 Jul 2010) | 10 lines

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

    ........
      r280341 | jeang | 2010-07-29 10:52:31 -0500 (Thu, 29 Jul 2010) | 2 lines

      Fix a dsp structure leak occuring when a local channel is put into a meetme
      conference, then masquaraded away.
      ABE-2422
    ........
  ................
................

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

apps/app_meetme.c

index 645cb11..85bb0a6 100644 (file)
@@ -2686,6 +2686,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
 
        conf_flush(fd, chan);
 
+       if (dsp)
+               ast_dsp_free(dsp);
+
        if (!(dsp = ast_dsp_new())) {
                ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
                res = -1;