[mod_event_socket] Add null pointer checks on listener session and socket

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 23915d4a379aeea487f9dfcd51813aa9629ad909..192b81c1f48b906e32345a741e49f8d27086ecf4 100644 (file)
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -2635,11 +2635,22 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
 
        switch_assert(listener != NULL);
 
-       if ((session = listener->session)) {
-               if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
-                       locked = 0;
-                       goto done;
-               }
+       if (!(session = listener->session)) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Listener session is null!\n");
+               switch_clear_flag_locked(listener, LFLAG_RUNNING);
+               goto done;
+       }
+
+       if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to lock session!\n");
+               locked = 0;
+               goto done;
+       }
+
+       if (!listener->sock) {
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Listener socket is null!\n");
+               switch_clear_flag_locked(listener, LFLAG_RUNNING);
+               goto done;
        }
 
        switch_socket_opt_set(listener->sock, SWITCH_SO_TCP_NODELAY, TRUE);