aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-29 16:01:35 +0000
committerjeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-29 16:01:35 +0000
commit7d52daf8a55e79bb686ea1258948b8ebddbcb3f6 (patch)
tree7da2aadd3c47a8c75df4e7cb79ca00a3cea9fde6
parentfd53cfe17b54ed9491a1d87a7e94cf41e6de2020 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@280345 f38db490-d61c-443f-a65b-d21fe96a405b
-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 4e490a0db..3cbc664e3 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -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;