From fdea54f5e76bb27d2feeaca3f4f129e18533870d Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 1 Dec 2016 09:40:24 -0500
Subject: [PATCH] (fix) properly escape all GAL responses (fixes #3923)

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 2b1b33212..f2413a19a 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2826,31 +2826,31 @@ void handle_eas_terminate(int signum)
               [s appendString: @"<Properties>"];
               
               if ((o = [contact objectForKey: @"displayname"]))
-                [s appendFormat: @"<DisplayName xmlns=\"Gal:\">%@</DisplayName>", o];
+                [s appendFormat: @"<DisplayName xmlns=\"Gal:\">%@</DisplayName>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"title"]))
-                [s appendFormat: @"<Title xmlns=\"Gal:\">%@</Title>", o];
+                [s appendFormat: @"<Title xmlns=\"Gal:\">%@</Title>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"givenname"]))
-                [s appendFormat: @"<FirstName xmlns=\"Gal:\">%@</FirstName>", o];
+                [s appendFormat: @"<FirstName xmlns=\"Gal:\">%@</FirstName>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"sn"]))
-                [s appendFormat: @"<LastName xmlns=\"Gal:\">%@</LastName>", o];
+                [s appendFormat: @"<LastName xmlns=\"Gal:\">%@</LastName>", [o activeSyncRepresentationInContext: context]];
               
               if ([current_mail length] > 0)
                 [s appendFormat: @"<EmailAddress xmlns=\"Gal:\">%@</EmailAddress>", current_mail];
               
               if ((o = [contact objectForKey: @"telephonenumber"]))
-                [s appendFormat: @"<Phone xmlns=\"Gal:\">%@</Phone>", o];
+                [s appendFormat: @"<Phone xmlns=\"Gal:\">%@</Phone>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"homephone"]))
-                [s appendFormat: @"<HomePhone xmlns=\"Gal:\">%@</HomePhone>", o];
+                [s appendFormat: @"<HomePhone xmlns=\"Gal:\">%@</HomePhone>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"mobile"]))
-                [s appendFormat: @"<MobilePhone xmlns=\"Gal:\">%@</MobilePhone>", o];
+                [s appendFormat: @"<MobilePhone xmlns=\"Gal:\">%@</MobilePhone>", [o activeSyncRepresentationInContext: context]];
               
               if ((o = [contact objectForKey: @"o"]))
-                [s appendFormat: @"<Company xmlns=\"Gal:\">%@</Company>", o];
+                [s appendFormat: @"<Company xmlns=\"Gal:\">%@</Company>", [o activeSyncRepresentationInContext: context]];
               
               [s appendString: @"</Properties>"];
               [s appendString: @"</Result>"];