From 81aee49555c2d24217afd4c64429a2f2ad35bc2f Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 22 Sep 2016 12:57:01 -0400
Subject: [PATCH] (fix) avoid generating invalid response if mail isn't found

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index bd02f2e2a..bd3583644 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2940,17 +2940,15 @@ void handle_eas_terminate(int signum)
   for (i = 0; i < total; i++)
     {
       itemId = [[sortedUIDs objectAtIndex: i] stringValue];
-
-      [s appendString: @"<Result xmlns=\"Search:\">"];
-      [s appendFormat: @"<LongId>%@+%@</LongId>", folderId, itemId];
-      [s appendFormat: @"<CollectionId xmlns=\"AirSyncBase:\">%@</CollectionId>", folderId];
-      [s appendString: @"<Properties>"];
-
       mailObject = [currentFolder lookupName: itemId  inContext: context  acquire: NO];
 
       if ([mailObject isKindOfClass: [NSException class]])
 	continue;
 
+      [s appendString: @"<Result xmlns=\"Search:\">"];
+      [s appendFormat: @"<LongId>%@+%@</LongId>", folderId, itemId];
+      [s appendFormat: @"<CollectionId xmlns=\"AirSyncBase:\">%@</CollectionId>", folderId];
+      [s appendString: @"<Properties>"];
       [s appendFormat: [mailObject activeSyncRepresentationInContext: context]];
       [s appendString: @"</Properties>"];
       [s appendFormat: @"</Result>"];