From: Michael Jerris <mike@jerris.com>
Date: Wed, 9 Jul 2014 18:32:38 +0000 (-0400)
Subject: CID:1224272 Dereference after null check.  member can not actually be NULL in any... 
X-Git-Tag: v1.5.13~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2887fb89e8e514ff3b1e9d98e815e21d2960087;p=thirdparty%2Ffreeswitch.git

CID:1224272 Dereference after null check.  member can not actually be NULL in any of the scenarios calling this function
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 65e633b40e..6ce838f352 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -5550,7 +5550,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
 /* Say some thing with TTS in the conference room */
 static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin)
 {
-	conference_obj_t *conference = (member != NULL ? member->conference : NULL);
+	conference_obj_t *conference = member->conference;
 	conference_file_node_t *fnode, *nptr;
 	switch_memory_pool_t *pool;
 	switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;