Catch NSException while unarchiving message text

airmessage · Aug 11, 2022 · f0e837f · f0e837f
1 parent 816b006
commit f0e837f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/AirMessage/Database/DatabaseConverter.swift b/AirMessage/Database/DatabaseConverter.swift
@@ -459,7 +459,17 @@ class DatabaseConverter {
 		}
 
 		//Retrieve the archive contents
-		guard let attributedString = unarchiver.decodeObject() as? NSAttributedString else {
+		var decodedObject: Any?
+		do {
+			try ObjC.catchException {
+				decodedObject = unarchiver.decodeObject()
+			}
+		} catch {
+			LogManager.log("Encountered an exception while decoding object for message \(logID ?? "unknown"): \(error)", level: .notice)
+			return nil
+		}
+
+		guard let attributedString = decodedObject as? NSAttributedString else {
 			LogManager.log("Failed to decode object for message \(logID ?? "unknown")", level: .notice)
 			return nil
 		}