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 404592a4a0634d9ed428360dac79361e28a46d9d..de1204eb919d6b206092f840d6d1d784957ce351 100644 (file)
--- 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) {