From 87477e308d1cbd74183c13f3eccfe1ce2ab60f11 Mon Sep 17 00:00:00 2001 From: Brian West Date: Mon, 21 Dec 2009 22:48:33 +0000 Subject: [PATCH] fix null pointer issue in event socket git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16012 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../event_handlers/mod_event_socket/mod_event_socket.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c index 7f24d2b9e5..3ef03f3a9f 100644 --- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c +++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c @@ -2016,7 +2016,6 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj) switch_assert(listener != NULL); if ((session = listener->session)) { - channel = switch_core_session_get_channel(session); if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { goto done; } @@ -2162,11 +2161,14 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj) } switch_mutex_unlock(listener->filter_mutex); - if (listener->session && (switch_test_flag(listener, LFLAG_RESUME) || - ((var = switch_channel_get_variable(channel, "socket_resume")) && switch_true(var)))) { + if (listener->session) { channel = switch_core_session_get_channel(listener->session); + } + + if (channel && (switch_test_flag(listener, LFLAG_RESUME) || ((var = switch_channel_get_variable(channel, "socket_resume")) && switch_true(var)))) { switch_channel_set_state(channel, CS_RESET); } + if (listener->sock) { char disco_buf[512] = ""; const char message[] = "Disconnected, goodbye.\nSee you at ClueCon! http://www.cluecon.com/\n";