From: Michael Jerris <mike@jerris.com>
Date: Mon, 29 Oct 2007 18:18:13 +0000 (+0000)
Subject: be more careful about not dereferencing NULL (attempt to fix MODAPP-45)
X-Git-Tag: v1.0-beta2~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa7d8da54cd5c80ef974541c2462ddf4a01e36de;p=thirdparty%2Ffreeswitch.git

be more careful about not dereferencing NULL (attempt to fix MODAPP-45)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6085 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index f2821d7a28..8a20130273 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -350,11 +350,19 @@ static switch_status_t conference_add_event_data(conference_obj_t * conference,
 static switch_status_t conference_add_event_member_data(conference_member_t * member, switch_event_t *event)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_channel_t *channel = switch_core_session_get_channel(member->session);
-	switch_channel_event_set_data(channel, event);
+	
+	if (member) {
+		if (member->session) {
+			switch_channel_t *channel = switch_core_session_get_channel(member->session);
+			switch_channel_event_set_data(channel, event);
+		}
 
-	status = conference_add_event_data(member->conference, event);
-	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
+		if (member->conference) {
+			status = conference_add_event_data(member->conference, event);
+		}
+
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
+	}
 
 	return status;
 }