From 800e2a95412045f565e7559b77b05eff5567cb95 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 12 Sep 2016 22:53:41 -0400
Subject: [PATCH] Log exception rather than crash upon failed deserialization

while populating secondary indexes

// FREEBIE
---
 src/Storage/TSStorageManager.m | 57 ++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/Storage/TSStorageManager.m b/src/Storage/TSStorageManager.m
index 0e94a147c..a5c904a66 100644
--- a/src/Storage/TSStorageManager.m
+++ b/src/Storage/TSStorageManager.m
@@ -49,20 +49,61 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
       return [self databasePassword];
     };
 
-    _database     = [[YapDatabase alloc] initWithPath:[self dbPath] serializer:NULL deserializer:NULL options:options];
+    _database = [[YapDatabase alloc] initWithPath:[self dbPath]
+                                       serializer:NULL
+                                     deserializer:[[self class] logOnFailureDeserializer]
+                                          options:options];
     _dbConnection = self.newDatabaseConnection;
 
     return self;
 }
 
+/**
+ * NSCoding sometimes throws exceptions killing our app. We want to log that exception.
+ **/
++ (YapDatabaseDeserializer)logOnFailureDeserializer
+{
+    return ^id(NSString __unused *collection, NSString __unused *key, NSData *data) {
+        if (!data || data.length <= 0) {
+            return nil;
+        }
+        @try {
+            return [NSKeyedUnarchiver unarchiveObjectWithData:data];
+        } @catch (NSException *exception) {
+            // Sync log in case we bail.
+            NSLog(@"%@ Unarchiving key:%@ from collection:%@ and data %@ failed with error: %@",
+                [self tag],
+                key,
+                collection,
+                data,
+                exception.reason);
+            // Sync log in case we bail.
+            NSLog(@"%@ Raising exception since deserialization failed", [self tag]);
+            [exception raise];
+        }
+    };
+}
+
 - (void)setupDatabase {
     [TSDatabaseView registerThreadDatabaseView];
     [TSDatabaseView registerBuddyConversationDatabaseView];
     [TSDatabaseView registerUnreadDatabaseView];
     [TSDatabaseView registerSecondaryDevicesDatabaseView];
 
-    [self.database registerExtension:[TSDatabaseSecondaryIndexes registerTimeStampIndex] withName:@"idx"];
-    [OWSReadReceipt registerIndexOnSenderIdAndTimestampWithDatabase:self.database];
+    // Seeing this raise an exception-on-boot for some users, making it impossible to get any   good data.
+    @try {
+        [self.database registerExtension:[TSDatabaseSecondaryIndexes registerTimeStampIndex] withName:@"idx"];
+    } @catch (NSException *exception) {
+        DDLogError(@"%@ Failed to register timetamp index with exception: %@ with reason: %@", self.tag, exception, exception.reason);
+    }
+
+    // Seeing this raise an exception-on-boot for some users, making it impossible to get any good data.
+    @try {
+        [OWSReadReceipt registerIndexOnSenderIdAndTimestampWithDatabase:self.database];
+    }
+    @catch (NSException *exception) {
+        DDLogError(@"%@ Failed to register read receipt index with exception: %@ with reason: %@", self.tag, exception, exception.reason);
+    }
 }
 
 
@@ -280,4 +321,14 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
     [[self init] setupDatabase];
 }
 
++ (NSString *)tag
+{
+    return [NSString stringWithFormat:@"[%@]", self.class];
+}
+
+- (NSString *)tag
+{
+    return self.class.tag;
+}
+
 @end