From: Michael Jerris <mike@jerris.com>
Date: Thu, 9 Aug 2007 03:19:07 +0000 (+0000)
Subject: fix for MODAPP-25.
X-Git-Tag: v1.0-beta1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c829877254d8f28b99772c99ef70e9b734704153;p=thirdparty%2Ffreeswitch.git

fix for MODAPP-25.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5579 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 404592a4a0..de1204eb91 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -4451,7 +4451,10 @@ static switch_status_t conference_new_install_caller_controls_custom(conference_
 	switch_xml_t xml_kvp;
 
 	assert(conference != NULL);
-	assert(xml_controls != NULL);
+
+	if (!xml_controls) {
+		return status;
+	}
 
 	/* parse the controls tree for caller control digit strings */
 	for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) {