Fix crash when importing wallets from private key. (trustwallet#923)

huangfy1 · Sep 18, 2018 · 55ea679 · 55ea679
1 parent 5f0b79d
commit 55ea679
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/Trust/EtherClient/EtherKeystore.swift b/Trust/EtherClient/EtherKeystore.swift
@@ -116,19 +116,25 @@ class EtherKeystore: Keystore {
                 }
             }
         case .privateKey(let privateKey):
-            let privateKeyData = PrivateKey(data: Data(hexString: privateKey)!)!
-            DispatchQueue.global(qos: .userInitiated).async {
-                do {
-                    let wallet = try self.keyStore.import(privateKey: privateKeyData, password: newPassword, coin: coin)
-                    self.setPassword(newPassword, for: wallet)
-                    DispatchQueue.main.async {
-                        completion(.success(WalletInfo(type: .privateKey(wallet))))
-                    }
-                } catch {
-                    DispatchQueue.main.async {
-                        completion(.failure(KeystoreError.failedToImportPrivateKey))
+            if let data = Data(hexString: privateKey),
+               let privateKeyData = PrivateKey(data: data) {
+                DispatchQueue.global(qos: .userInitiated).async {
+                    do {
+                        let wallet = try self.keyStore.import(privateKey: privateKeyData, password: newPassword, coin: coin)
+                        self.setPassword(newPassword, for: wallet)
+                        DispatchQueue.main.async {
+                            completion(.success(WalletInfo(type: .privateKey(wallet))))
+                        }
+                    } catch {
+                        DispatchQueue.main.async {
+                            completion(.failure(KeystoreError.failedToImportPrivateKey))
+                        }
                     }
                 }
+            } else {
+                DispatchQueue.main.async {
+                    completion(.failure(KeystoreError.failedToImportPrivateKey))
+                }
             }
         case .mnemonic(let words, let passphrase, let derivationPath):
             let string = words.map { String($0) }.joined(separator: " ")