From: Stefan Knoblich <stkn@openisdn.net>
Date: Wed, 11 Jul 2012 23:42:14 +0000 (+0200)
Subject: mod_conference: Fix format string errors.
X-Git-Tag: v1.2.0~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bd63d32d4606a9b3596d48245fc67d2f7c9cb6;p=thirdparty%2Ffreeswitch.git

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 <stkn@openisdn.net>
---

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);
 	}