[Freeswitch-svn] [commit] r11328 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: mikej
Date: Tue Jan 20 20:18:03 2009
New Revision: 11328

Log:
fix build

Modified:
   freeswitch/trunk/src/switch_core_media_bug.c
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_core_media_bug.c
==============================================================================
--- freeswitch/trunk/src/switch_core_media_bug.c	(original)
+++ freeswitch/trunk/src/switch_core_media_bug.c	Tue Jan 20 20:18:03 2009
@@ -260,7 +260,8 @@
 	if (bug->callback) {
 		switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT);
 		if (result == SWITCH_FALSE) {
-			switch_core_media_bug_remove(session, new_bug);
+			switch_core_media_bug_remove(session, &bug);
+			*new_bug = NULL;
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel));
 			return SWITCH_STATUS_GENERR;
 		}

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Jan 20 20:18:03 2009
@@ -388,6 +388,11 @@
 							int hits = 2;
 							char *p = ring_array[fx], *q;
 						
+							if (!p) {
+								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
+								continue;
+							}
+
 							if (!(hits = atoi(p))) {
 								hits = 2;
 							}