]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 280341 via svnmerge from
authorJean Galarneau <jgalarneau@digium.com>
Thu, 29 Jul 2010 16:01:35 +0000 (16:01 +0000)
committerJean Galarneau <jgalarneau@digium.com>
Thu, 29 Jul 2010 16:01:35 +0000 (16:01 +0000)
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/branches/1.6.2@280345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 4e490a0db79c2476b2c270abbc351cf6d0b0c162..3cbc664e39c34b32fee4ffea2fdd2cb7ec040719 100644 (file)
@@ -2526,6 +2526,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 
        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;