Fix: Fatal Error: try! (#7)

vpeschenkov · Sep 22, 2021 · 370366e · 370366e
1 parent b5ab550
commit 370366e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,4 +18,8 @@
 
 # 1.0.3
 ### Added
-- Added `setRawObject(_:forKey)`
+- Added `setRawObject(_:forKey)`
+
+# 1.0.6
+### Fixed
+- Crash with `fatal error: 'try!' expression unexpectedly raised`
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ pod 'SecureDefaults', '1.0.0' # Swift 4.2
 Add this to `Cartfile`
 
 ```ruby
-github "vpeschenkov/SecureDefaults" == 1.0.5 # Swift 5.0
+github "vpeschenkov/SecureDefaults" == 1.0.6 # Swift 5.0
 github "vpeschenkov/SecureDefaults" == 1.0.0 # Swift 4.2
 ```
 
@@ -116,7 +116,7 @@ import PackageDescription
 let package = Package(
   name: "YourProject",
   dependencies: [
-    .package(url: "https://github.com/vpeschenkov/SecureDefaults", "1.0.4")
+    .package(url: "https://github.com/vpeschenkov/SecureDefaults", "1.0.6")
   ],
   targets: [
     .target(name: "YourProject", dependencies: ["SecureDefaults"])

diff --git a/SecureDefaults.podspec b/SecureDefaults.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'SecureDefaults'
-  s.version          = '1.0.5'
+  s.version          = '1.0.6'
   s.summary          = 'A lightweight wrapper over UserDefaults/NSUserDefaults with an extra AES-256 encryption layer'
   s.homepage         = 'https://github.com/vpeschenkov/SecureDefaults'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/Sources/SecureDefaults/SecureDefaults.swift b/Sources/SecureDefaults/SecureDefaults.swift
@@ -211,11 +211,11 @@ public class SecureDefaults: UserDefaults {
     private var suitename: String?
 
     private lazy var decrypter = {
-        return try! AES256(key: self.key, iv: self.IV)
+        return try? AES256(key: self.key, iv: self.IV)
     }()
 
     private lazy var encrypter = {
-        return try! AES256(key: self.key, iv: self.IV)
+        return try? AES256(key: self.key, iv: self.IV)
     }()
 
     private var _key: Data? {
@@ -261,7 +261,7 @@ public class SecureDefaults: UserDefaults {
     private func secretObject(forKey defaultName: String) -> Any? {
         let object = super.object(forKey: defaultName)
         if let object = object {
-            let decrypted = try! decrypter.decrypt(object as! Data)
+            guard let decrypted = try? decrypter?.decrypt(object as! Data) else { return nil }
             let data = NSKeyedUnarchiver.unarchiveObject(with: decrypted)
             return data
         }
@@ -271,7 +271,7 @@ public class SecureDefaults: UserDefaults {
     private func setSecret(_ value: Any?, forKey defaultName: String) {
         if let value = value {
             let data = NSKeyedArchiver.archivedData(withRootObject: value)
-            super.set(try! encrypter.encrypt(data), forKey: defaultName)
+            super.set(try? encrypter?.encrypt(data), forKey: defaultName)
             return
         }
         super.set(nil, forKey: defaultName)