Merged revisions 108682 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108682 | qwell | 2008-03-14 09:29:05 -0500 (Fri, 14 Mar 2008) | 4 lines

Fix a potential segfault if chan (or chan->music_state) is NULL.

Closes issue #12210, credit to edantie for pointing this out.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108683 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index b43a51d..70f8469 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -210,22 +210,25 @@ static void ast_moh_free_class(struct mohclass **mohclass)
 
 static void moh_files_release(struct ast_channel *chan, void *data)
 {
-       struct moh_files_state *state = chan->music_state;
+       struct moh_files_state *state;
 
-       if (chan && state) {
-               if (chan->stream) {
-                        ast_closestream(chan->stream);
-                        chan->stream = NULL;
-                }
-               ast_verb(3, "Stopped music on hold on %s\n", chan->name);
+       if (chan) {
+               if ((state = chan->music_state)) {
+                       if (chan->stream) {
+                               ast_closestream(chan->stream);
+                               chan->stream = NULL;
+                       }
+                       ast_verb(3, "Stopped music on hold on %s\n", chan->name);
+       
+                       if (state->origwfmt && ast_set_write_format(chan, state->origwfmt)) {
+                               ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", chan->name, state->origwfmt);
+                       }
+                       state->save_pos = state->pos;
 
-               if (state->origwfmt && ast_set_write_format(chan, state->origwfmt)) {
-                       ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", chan->name, state->origwfmt);
+                       if (ast_atomic_dec_and_test(&state->class->inuse) && state->class->delete)
+                               ast_moh_destroy_one(state->class);
                }
-               state->save_pos = state->pos;
        }
-       if (ast_atomic_dec_and_test(&state->class->inuse) && state->class->delete)
-               ast_moh_destroy_one(state->class);
 }