[Freeswitch-svn] [commit] r5985 - in freeswitch/trunk/src/mod: applications/mod_conference languages/mod_spidermonkey

[Freeswitch SVN]

Author: mikej
Date: Thu Oct 18 20:44:27 2007
New Revision: 5985

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c

Log:
don't do operations in an assert (re: FSCORE-50)

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Thu Oct 18 20:44:27 2007
@@ -4331,7 +4331,8 @@
 		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;

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	Thu Oct 18 20:44:27 2007
@@ -2441,7 +2441,8 @@
 {
 	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;