diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 4b03ee2421..198063b5bf 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1363,12 +1363,13 @@ static void conference_list_pretty(conference_obj_t *conference, switch_stream_h conference_member_t *member = NULL; switch_mutex_lock(conference->member_mutex); + stream->write_function(stream, "
Current Callers:\n"); for (member = conference->members; member; member = member->next) { switch_channel_t *channel = switch_core_session_get_channel(member->session); switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel); - stream->write_function(stream, "Caller %s <%s>\n", + stream->write_function(stream, "*) %s (%s)\n", profile->caller_id_name, profile->caller_id_number ); @@ -2741,6 +2742,10 @@ static switch_status_t chat_send(char *proto, char *from, char *to, char *subjec conference_obj_t *conference = NULL; switch_stream_handle_t stream = {0}; + if (!body) { + return SWITCH_STATUS_SUCCESS; + } + if (!(ci = switch_loadable_module_get_chat_interface(proto))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); } diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 0d79b2fcf1..238eb9085f 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -2127,8 +2127,10 @@ static void sip_i_message(int status, const char *subject = "n/a"; char *msg = NULL; - if (strstr((char*)sip->sip_content_type->c_subtype, "composing")) { - return; + if (sip->sip_content_type) { + if (strstr((char*)sip->sip_content_type->c_subtype, "composing")) { + return; + } } if (from) {