From a0bd63d32d4606a9b3596d48245fc67d2f7c9cb6 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Thu, 12 Jul 2012 01:42:14 +0200 Subject: [PATCH] mod_conference: Fix format string errors. Use switch_event_add_header_string() where needed and add a dummy "%s" format string to switch_event_add_body() calls. Signed-off-by: Stefan Knoblich --- .../applications/mod_conference/mod_conference.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 8c82e03f2a..0525a5031a 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1248,11 +1248,11 @@ static void send_rfc_event(conference_obj_t *conference) if (switch_event_create(&event, SWITCH_EVENT_CONFERENCE_DATA) == SWITCH_STATUS_SUCCESS) { event->flags |= EF_UNIQ_HEADERS; - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "conference-name", name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "conference-domain", domain); - + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "conference-name", name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "conference-domain", domain); + body = conference_rfc4579_render(conference, NULL, event); - switch_event_add_body(event, body); + switch_event_add_body(event, "%s", body); free(body); switch_event_fire(&event); } @@ -8092,7 +8092,7 @@ static void call_setup_event_handler(switch_event_t *event) for(hp = event->headers; hp; hp = hp->next) { if (!strncasecmp(hp->name, "var_", 4)) { - switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, hp->name + 4, hp->value); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, hp->name + 4, hp->value); } } @@ -8128,9 +8128,9 @@ static void conf_data_event_handler(switch_event_t *event) switch_event_add_header(revent, SWITCH_STACK_TOP, "Event-Name", "CONFERENCE_DATA"); body = conference_rfc4579_render(conference, event, revent); - switch_event_add_body(revent, body); + switch_event_add_body(revent, "%s", body); switch_event_fire(&revent); - switch_safe_free(body); + switch_safe_free(body); } switch_thread_rwlock_unlock(conference->rwlock); }