Prevent keyed archiver encoding crashes when writing read receipts to…

… the file store
Topheee · Aug 22, 2023 · 42a57e0 · 42a57e0
1 parent 2adb8c2
commit 42a57e0
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m
@@ -2209,7 +2209,23 @@ - (void)saveReceipts
 
                         // Store new data
                         [self checkFolderExistenceForRoom:roomId forBackup:NO];
-                        [NSKeyedArchiver archiveRootObject:receiptsStore toFile:file];
+
+                        NSError *error = nil;
+                        NSData *result = [NSKeyedArchiver archivedDataWithRootObject:receiptsStore requiringSecureCoding:false error:&error];
+
+                        if (error != nil)
+                        {
+                            MXLogErrorDetails(@"Failed archiving receipts store", error);
+                            continue;
+                        }
+
+                        [result writeToURL:[NSURL fileURLWithPath:file] options: NSDataWritingAtomic error: &error];
+
+                        if (error != nil)
+                        {
+                            MXLogErrorDetails(@"Failed writing receipts store to file", error);
+                            continue;
+                        }
                     }
                 }
             }