From 091560b764a22e9da20c03ddba6e2a0aa6b1d810 Mon Sep 17 00:00:00 2001 From: Rafal Michalski Date: Wed, 12 Jan 2011 16:15:38 +0100 Subject: [PATCH] obexd: Fix crash after fetching single owner vCard This patch makes that crash is avoided in case of fetching single owner vCard (0.vcf) from phonebook. Crash was caused because previous modifications of other queries wasn't included in query called CONTACTS_OTHER_QUERY_FROM_URI. --- obexd/plugins/phonebook-tracker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index 237fb3361..311babd5c 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -757,10 +757,10 @@ "ORDER BY ?_key tracker:id(<%s>)" #define CONTACTS_OTHER_QUERY_FROM_URI \ - "SELECT \"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" " \ - "fn:concat(\"TYPE_OTHER\", \"\31\", nco:phoneNumber(?t)) \"\" " \ + "SELECT fn:concat(\"TYPE_OTHER\", \"\31\", nco:phoneNumber(?t))"\ + "\"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" " \ "\"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" \"\" " \ - " \"NOTACALL\" \"false\" \"false\" <%s> " \ + " \"NOTACALL\" \"false\" \"false\" <%s> " \ "WHERE { " \ "<%s> a nco:Contact . " \ "OPTIONAL { <%s> nco:hasPhoneNumber ?t . } " \ -- 2.47.3