linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH obexd] Fix proper data escaping for vCard listing
@ 2011-07-21 13:55 Bartosz Szatkowski
  2011-07-26 10:38 ` Johan Hedberg
  0 siblings, 1 reply; 2+ messages in thread
From: Bartosz Szatkowski @ 2011-07-21 13:55 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Bartosz Szatkowski

Up until now it was possible to inject some XML or just broke returned
vCard listing by preparing contact with some special characters.
---
 plugins/pbap.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/plugins/pbap.c b/plugins/pbap.c
index 5455cce..82963af 100644
--- a/plugins/pbap.c
+++ b/plugins/pbap.c
@@ -469,9 +469,12 @@ static int generate_response(void *user_data)
 	pbap->obj->buffer = g_string_new(VCARD_LISTING_BEGIN);
 	for (; l && max; l = l->next, max--) {
 		const struct cache_entry *entry = l->data;
+		char *escaped_name = g_markup_escape_text(entry->name, -1);
 
 		g_string_append_printf(pbap->obj->buffer,
-			VCARD_LISTING_ELEMENT, entry->handle, entry->name);
+			VCARD_LISTING_ELEMENT, entry->handle, escaped_name);
+
+		g_free(escaped_name);
 	}
 
 	pbap->obj->buffer = g_string_append(pbap->obj->buffer,
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH obexd] Fix proper data escaping for vCard listing
  2011-07-21 13:55 [PATCH obexd] Fix proper data escaping for vCard listing Bartosz Szatkowski
@ 2011-07-26 10:38 ` Johan Hedberg
  0 siblings, 0 replies; 2+ messages in thread
From: Johan Hedberg @ 2011-07-26 10:38 UTC (permalink / raw)
  To: Bartosz Szatkowski; +Cc: linux-bluetooth

Hi Bartosz,

On Thu, Jul 21, 2011, Bartosz Szatkowski wrote:
> Up until now it was possible to inject some XML or just broke returned
> vCard listing by preparing contact with some special characters.
> ---
>  plugins/pbap.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)

Applied. Thanks.

Johan

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-07-26 10:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 13:55 [PATCH obexd] Fix proper data escaping for vCard listing Bartosz Szatkowski
2011-07-26 10:38 ` Johan Hedberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).