summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJean Galarneau <jgalarneau@digium.com>2010-07-29 16:47:23 +0000
committerJean Galarneau <jgalarneau@digium.com>2010-07-29 16:47:23 +0000
commit0a5c0dd75e83eceee574913d0013729de5ec909f (patch)
treebcd38733a20fcf21c1b19934428617bd419449c6 /apps
parentee20d59ec5083bb46890a0ad5f7235b28798b7a3 (diff)
Merged revisions 280346 via svnmerge from
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
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 645cb1114..85bb0a645 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -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;