diff options
| author | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-29 16:07:16 +0000 |
|---|---|---|
| committer | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-29 16:07:16 +0000 |
| commit | cbd418b48baf73ee5d6e51802bf2695fe7f321e1 (patch) | |
| tree | 5b37ca0e68c8b4fbecd35b72022d8349c96d07b0 /apps | |
| parent | cf4f1bbf8300fa66d892891ba9b3c34a44171e20 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@280346 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 3 |
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; |