From a45f8065d742b8b7a1e59140336834e5edf3e8e3 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 19 Oct 2007 00:44:27 +0000 Subject: [PATCH] don't do operations in an assert (re: FSCORE-50) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5985 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_conference/mod_conference.c | 3 ++- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index df51f62f74..57d257b498 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -4331,7 +4331,8 @@ SWITCH_STANDARD_APP(conference_function) char *dfile = NULL; if (conference->sound_prefix) { - assert((dfile = switch_mprintf("%s/%s", conference->sound_prefix, conference->kicked_sound))); + dfile = switch_mprintf("%s/%s", conference->sound_prefix, conference->kicked_sound); + assert(dfile); toplay = dfile; } else { toplay = conference->kicked_sound; diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index dab916e14d..582606d6be 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -2441,7 +2441,8 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsva { struct js_session *jss = NULL; - assert((jss = malloc(sizeof(*jss)))); + jss = malloc(sizeof(*jss)); + assert(jss); memset(jss, 0, sizeof(*jss)); jss->cx = cx; jss->obj = obj;