From 6b46843c5784c61ea8c80f68eb22f52727edbacc Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 23 Feb 2007 17:28:41 +0000 Subject: [PATCH] try a bit harder to make sure we don't do printf like functions on null. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4369 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_channel.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/switch_channel.c b/src/switch_channel.c index 77874f7126..14fa0753d0 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -698,19 +698,19 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw originatee_caller_profile = caller_profile->originatee_caller_profile; } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(channel->state)); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", switch_channel_state_name(channel->state)); snprintf(state_num, sizeof(state_num), "%d", channel->state); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", (char *) state_num); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", state_num); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", "%s", switch_channel_get_name(channel)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); if ((codec = switch_core_session_get_read_codec(channel->session))) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Name", "%s", codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Name", "%s", switch_str_nil(codec->implementation->iananame)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Rate", "%u", codec->implementation->samples_per_second); } if ((codec = switch_core_session_get_write_codec(channel->session))) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", "%s", codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", "%s", switch_str_nil(codec->implementation->iananame)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->samples_per_second); } @@ -734,8 +734,10 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw hi = switch_hash_next(hi)) { char buf[1024]; switch_hash_this(hi, &var, NULL, &val); - snprintf(buf, sizeof(buf), "variable_%s", (char *) var); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", (char *) val); + if (var && val) { + snprintf(buf, sizeof(buf), "variable_%s", var); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", val); + } }