kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_musiconhold.c: Release any format refs before memset().

Browse Source 
* Clear the channel music_state pointer before destroying the music_state
object for safety.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@422037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-08-25 16:44:37 +00:00
parent d6ea6f5848
commit 00ffbc40e1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_musiconhold.c
View File

@@ -479,6 +479,8 @@ static void *moh_files_alloc(struct ast_channel *chan, void *params)
/* Resume MOH from where we left off last time or start from scratch? */ /* Resume MOH from where we left off last time or start from scratch? */
if (state->save_total != class->total_files || strcmp(state->name, class->name) != 0) { if (state->save_total != class->total_files || strcmp(state->name, class->name) != 0) {
/* Start MOH from scratch. */ /* Start MOH from scratch. */
ao2_cleanup(state->origwfmt);
ao2_cleanup(state->mohwfmt);
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
if (ast_test_flag(class, MOH_RANDOMIZE) && class->total_files) { if (ast_test_flag(class, MOH_RANDOMIZE) && class->total_files) {
state->pos = ast_random() % class->total_files; state->pos = ast_random() % class->total_files;
@@ -974,6 +976,8 @@ static void *moh_alloc(struct ast_channel *chan, void *params)
mohclass_unref(state->class, "Uh Oh. Restarting MOH with an active class"); mohclass_unref(state->class, "Uh Oh. Restarting MOH with an active class");
ast_log(LOG_WARNING, "Uh Oh. Restarting MOH with an active class\n"); ast_log(LOG_WARNING, "Uh Oh. Restarting MOH with an active class\n");
} }
ao2_cleanup(state->origwfmt);
ao2_cleanup(state->mohwfmt);
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
} }
@@ -1304,6 +1308,7 @@ static void local_ast_moh_cleanup(struct ast_channel *chan)
struct moh_files_state *state = ast_channel_music_state(chan); struct moh_files_state *state = ast_channel_music_state(chan);
if (state) { if (state) {
ast_channel_music_state_set(chan, NULL);
if (state->class) { if (state->class) {
/* This should never happen. We likely just leaked some resource. */ /* This should never happen. We likely just leaked some resource. */
state->class = state->class =
@@ -1312,8 +1317,7 @@ static void local_ast_moh_cleanup(struct ast_channel *chan)
} }
ao2_cleanup(state->origwfmt); ao2_cleanup(state->origwfmt);
ao2_cleanup(state->mohwfmt); ao2_cleanup(state->mohwfmt);
ast_free(ast_channel_music_state(chan)); ast_free(state);
ast_channel_music_state_set(chan, NULL);
/* Only held a module reference if we had a music state */ /* Only held a module reference if we had a music state */
ast_module_unref(ast_module_info->self); ast_module_unref(ast_module_info->self);
} }